rgmanager: Fix orainstance.sh error checking

PATCH New Ryan McCabe 2 participants 2 messages Jun 28, 2012 – Jul 4, 2012

lore

Share & tools

lore

Ryan McCabe

author

2012-06-28 19:57 UTC #0 lore raw

PATCH 1/5 rgmanager: Fix orainstance.sh error checking

Pull in the fixed error checking that was added to oracledb.sh as a fix for rhbz#471066.

Resolves: rhbz#723819

Signed-off-by Ryan McCabe <[email protected]>

---
 rgmanager/src/resources/orainstance.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

rgmanager/src/resources/orainstance.sh +2 -2

index 6f2ff15..a9f690d 100755
@@ -105,7 +105,7 @@ start_db() {
 
 	# If we see:
 	# ORA-.....: failure, we failed
-	grep -q "failure" $logfile
+	grep -q "^ORA-" $logfile
 	rv=$?
 
     rm -f $logfile

@@ -155,7 +155,7 @@ stop_db() {
 		return 1
 	fi
 
-	grep -q failure $logfile
+	grep -q "^ORA-" $logfile
     rv=$?
     rm -f $logfile

Signature · 1 line

1.7.10.2

Fabio M. Di Nitto

2012-07-04 11:04 UTC #1 lore raw

PATCH 1/5 rgmanager: Fix orainstance.sh error checking

ACK

Quoted 24 lines · Ryan McCabe

Pull in the fixed error checking that was added to oracledb.sh as a fix for rhbz#471066.
Resolves: rhbz#723819
Signed-off-by Ryan McCabe <[email protected]> ---
rgmanager/src/resources/orainstance.sh | 4 ++-- 1 file changed,
2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0
b/rgmanager/src/resources/orainstance.sh index 6f2ff15..a9f690d 100755 --- a/rgmanager/src/resources/orainstance.sh +++ b/rgmanager/src/resources/orainstance.sh @@ -105,7 +105,7 @@ start_db() {
# If we see: # ORA-.....: failure, we failed - grep -q "failure"
$logfile + grep -q "^ORA-" $logfile rv=$?
rm -f $logfile @@ -155,7 +155,7 @@ stop_db() { return 1 fi
(quoted diff) +0 -1
-	grep -q failure $logfile +	grep -q "^ORA-" $logfile rv=$? rm -f
$logfile