From: Alberto Di Meglio <alberto.di.meglio@cern.ch>
Date: Mon, 21 Mar 2005 16:45:43 +0000 (+0000)
Subject: Fixed status return code
X-Git-Tag: glite-deployment-lb_R_1_2_2~11
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=a633a42a779a2a5ffe5bd415ea13f874b87e029f;p=jra1mw.git

Fixed status return code
---

diff --git a/org.glite.deployment.lb/config/scripts/glite-lb-config.py b/org.glite.deployment.lb/config/scripts/glite-lb-config.py
index 1721ac0..9b9871d 100644
--- a/org.glite.deployment.lb/config/scripts/glite-lb-config.py
+++ b/org.glite.deployment.lb/config/scripts/glite-lb-config.py
@@ -198,15 +198,12 @@ python %s-config [OPTION...]""" % (self.name, os.environ['GLITE_LOCATION'], \
 
         error_level = 0
 
-        retval = self.mysql.stop()
-        if retval != 0:
-            error_level = retval
-
         retval = os.system('%s/etc/init.d/glite-lb-bkserverd status' % os.environ['GLITE_LOCATION'])
+        print retval
         if retval != 0:
-            error_level = retval
+            error_level = 1
 
-        return 0
+        return error_level
         
     def configure(self):
         
@@ -403,7 +400,7 @@ if __name__ == '__main__':
     
     # Command line opts if any
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'chv', ['checkconf', 'help', 'version','stop','start', 'siteconfig='])
+        opts, args = getopt.getopt(sys.argv[1:], 'chv', ['checkconf', 'help', 'version','stop','start','status','siteconfig='])
     except getopt.GetoptError:
         service.usage(msg = "Unknown options(s)")
         sys.exit(1)
@@ -428,7 +425,7 @@ if __name__ == '__main__':
             service.start()
             sys.exit(0)
         if o == "--status":
-            sys.exit(service.start())
+            sys.exit(service.status())
                 
 
     # Check certificates
@@ -449,20 +446,20 @@ if __name__ == '__main__':
         
     # Configure the service
     if service.configure() == 0:
-        print "%s configuration successfully completed                " % service.friendly_name,
+        print "\n%s configuration successfully completed                " % service.friendly_name,
         glib.printOkMessage()
         glib.registerService()
     else:
-        print "An error occurred while configuring the %s            " % service.friendly_name,
+        print "\nAn error occurred while configuring the %s            " % service.friendly_name,
         glib.printFailedMessage()
         sys.exit(1)
         
     # Start the service
     if service.start() == 0:
-        print "The %s was successfully started           " % service.friendly_name,
+        print "\nThe %s was successfully started           " % service.friendly_name,
         glib.printOkMessage()
     else:
-        print "An error occurred while starting the %s            " % service.friendly_name,
+        print "\nAn error occurred while starting the %s            " % service.friendly_name,
         glib.printFailedMessage()
         sys.exit(1)