spacewalk/setup

Jan Pazdziora adelton at fedoraproject.org
Tue Jun 26 14:59:42 UTC 2012


 spacewalk/setup/bin/spacewalk-setup |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8655acd5c471c446f4ea25354ee8989aba640bde
Author: Jan Pazdziora <jpazdziora at redhat.com>
Date:   Tue Jun 26 16:57:36 2012 +0200

    Exit if starting tomcat did not pass.

diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index c08f777..f4d0ba4 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -136,7 +136,7 @@ print Spacewalk::Setup::loc("* Restarting services.\n");
 Spacewalk::Setup::system_or_exit(['/usr/sbin/spacewalk-service', 'restart'], 40,
 	       'Could not restart spacewalk services.');
 
-wait_for_tomcat($answers{hostname});
+wait_for_tomcat($answers{hostname}) or exit 56;
 
 Spacewalk::Setup::upgrade_stop_services(\%opts);
 Spacewalk::Setup::oracle_upgrade_start_db(\%opts);
@@ -1394,11 +1394,11 @@ sub wait_for_tomcat {
             sleep 5;
         }
         else {
-            return;
+            return 1;
         }
     }
     print "Tomcat failed to start properly or the installer ran out of tries.  Please check /var/log/tomcat*/catalina.out for errors.\n";
-    return;
+    return 0;
 }
 
 package Sat::Cert;




More information about the spacewalk-commits mailing list