Merge "barbican-manage: Return non-zero return code on failure"

barbican/cmd/barbican_manage.py

@@ -485,7 +485,8 @@ def main():
     try:
         return fn(CONF, *fn_args, **fn_kwargs)
     except Exception as e:
-        sys.exit("ERROR: %s" % e)
+        sys.stderr.write("ERROR: {0}\n".format(e))
+        sys.exit(1)
 
 
 if __name__ == '__main__':

barbican/cmd/keystone_listener.py

@@ -30,11 +30,6 @@ from oslo_service.backend import init_backend
 from oslo_service import service
 
 
-def fail(returncode, e):
-    sys.stderr.write("ERROR: {0}\n".format(e))
-    sys.exit(returncode)
-
-
 def main():
     try:
         config.setup_remote_pydev_debug()
@@ -64,7 +59,8 @@ def main():
         else:
             LOG.info("Exiting as Barbican Keystone listener is not enabled...")
     except RuntimeError as e:
-        fail(1, e)
+        sys.stderr.write("ERROR: {0}\n".format(e))
+        sys.exit(1)
 
 
 if __name__ == '__main__':

barbican/cmd/retry_scheduler.py

@@ -29,11 +29,6 @@ from oslo_log import log
 from oslo_service import service
 
 
-def fail(returncode, e):
-    sys.stderr.write("ERROR: {0}\n".format(e))
-    sys.exit(returncode)
-
-
 def main():
     try:
         CONF = config.CONF
@@ -54,7 +49,8 @@ def main():
             restart_method='mutate'
         ).wait()
     except RuntimeError as e:
-        fail(1, e)
+        sys.stderr.write("ERROR: {0}\n".format(e))
+        sys.exit(1)
 
 
 if __name__ == '__main__':

barbican/cmd/worker.py

@@ -31,11 +31,6 @@ from oslo_service.backend import init_backend
 from oslo_service import service
 
 
-def fail(returncode, e):
-    sys.stderr.write("ERROR: {0}\n".format(e))
-    sys.exit(returncode)
-
-
 def main():
     try:
         # Ensure oslo.service uses the threading backend early
@@ -60,7 +55,8 @@ def main():
             restart_method='mutate'
         ).wait()
     except RuntimeError as e:
-        fail(1, e)
+        sys.stderr.write("ERROR: {0}\n".format(e))
+        sys.exit(1)
 
 
 if __name__ == '__main__':