From f3364bc8a2cbd17efa332d8ba9eb7ac0c0364d1f Mon Sep 17 00:00:00 2001
From: Craig Vyvial <cp16net@gmail.com>
Date: Mon, 28 Oct 2013 23:12:35 -0500
Subject: [PATCH] make the bin scripts called with main()

This will make everything easier to manage and callable by other python
scripts/modules if you need to depend on the module. Others can then
just call the main() function instead of executing the script.

Closes-Bug: #1261823

Change-Id: I5e94ee19bd4f7a69d7ca5efc6288d402520cd5bf
---
 bin/trove-api              |  6 +++++-
 bin/trove-api-os-database  |  6 +++++-
 bin/trove-conductor        | 10 +++++++---
 bin/trove-guestagent       |  7 ++++++-
 bin/trove-manage           |  6 +++++-
 bin/trove-mgmt-taskmanager |  7 ++++++-
 bin/trove-taskmanager      |  7 ++++++-
 7 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/bin/trove-api b/bin/trove-api
index 01a33ed92b..a1fa0815c9 100755
--- a/bin/trove-api
+++ b/bin/trove-api
@@ -41,7 +41,7 @@ from trove.db import get_db_api
 CONF = cfg.CONF
 
 
-if __name__ == '__main__':
+def main():
     cfg.parse_args(sys.argv)
     logging.setup(None)
 
@@ -55,3 +55,7 @@ if __name__ == '__main__':
         import traceback
         print(traceback.format_exc())
         sys.exit("ERROR: %s" % error)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/bin/trove-api-os-database b/bin/trove-api-os-database
index 1c84cfed5b..654f3052d9 100755
--- a/bin/trove-api-os-database
+++ b/bin/trove-api-os-database
@@ -57,7 +57,7 @@ FLAGS = flags.FLAGS
 FLAGS.register_opts(trove_opts)
 
 
-if __name__ == '__main__':
+def main():
     utils.default_flagfile()
     flags.FLAGS(sys.argv)
     logging.setup()
@@ -66,3 +66,7 @@ if __name__ == '__main__':
     server = service.WSGIService(SERVICE_NAME, loader=loader)
     service.serve(server)
     service.wait()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/bin/trove-conductor b/bin/trove-conductor
index d491cb2b9d..166c8618db 100755
--- a/bin/trove-conductor
+++ b/bin/trove-conductor
@@ -37,7 +37,7 @@ from trove.openstack.common import service as openstack_service
 CONF = cfg.CONF
 
 
-def main():
+def launch_services():
     get_db_api().configure_db(CONF)
     manager = 'trove.conductor.manager.Manager'
     topic = CONF.conductor_queue
@@ -47,7 +47,7 @@ def main():
     launcher.wait()
 
 
-if __name__ == '__main__':
+def main():
     cfg.parse_args(sys.argv)
     logging.setup(None)
 
@@ -56,7 +56,11 @@ if __name__ == '__main__':
     if not debug_utils.enabled():
         eventlet.monkey_patch(thread=True)
     try:
-        main()
+        launch_services()
     except RuntimeError as error:
         print(traceback.format_exc())
         sys.exit("ERROR: %s" % error)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/bin/trove-guestagent b/bin/trove-guestagent
index f973fd55bd..09ee24d104 100755
--- a/bin/trove-guestagent
+++ b/bin/trove-guestagent
@@ -43,7 +43,8 @@ from trove.db import get_db_api
 CONF = cfg.CONF
 CONF.register_opts([openstack_cfg.StrOpt('guest_id')])
 
-if __name__ == '__main__':
+
+def main():
     cfg.parse_args(sys.argv)
     from trove.guestagent import dbaas
     logging.setup(None)
@@ -62,3 +63,7 @@ if __name__ == '__main__':
         import traceback
         print(traceback.format_exc())
         sys.exit("ERROR: %s" % error)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/bin/trove-manage b/bin/trove-manage
index 5c3cfab20c..5c0c501af5 100755
--- a/bin/trove-manage
+++ b/bin/trove-manage
@@ -95,7 +95,7 @@ class Commands(object):
             return utils.MethodInspector(getattr(self, command_name))
 
 
-if __name__ == '__main__':
+def main():
 
     def actions(subparser):
         parser = subparser.add_parser('db_sync')
@@ -133,3 +133,7 @@ if __name__ == '__main__':
     except Exception:
         print(_("Command failed, please check log for more info"))
         raise
+
+
+if __name__ == '__main__':
+    main()
diff --git a/bin/trove-mgmt-taskmanager b/bin/trove-mgmt-taskmanager
index 950a95aa9c..ae564c227c 100755
--- a/bin/trove-mgmt-taskmanager
+++ b/bin/trove-mgmt-taskmanager
@@ -45,7 +45,8 @@ from trove.db import get_db_api
 CONF = cfg.CONF
 CONF.register_opts([openstack_cfg.StrOpt('taskmanager_manager')])
 
-if __name__ == '__main__':
+
+def main():
     cfg.parse_args(sys.argv)
     logging.setup(None)
 
@@ -59,3 +60,7 @@ if __name__ == '__main__':
         import traceback
         print(traceback.format_exc())
         sys.exit("ERROR: %s" % error)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/bin/trove-taskmanager b/bin/trove-taskmanager
index e1bf02b224..4fb41de5a7 100755
--- a/bin/trove-taskmanager
+++ b/bin/trove-taskmanager
@@ -45,7 +45,8 @@ if os.path.exists(os.path.join(possible_topdir, 'trove', '__init__.py')):
 CONF = cfg.CONF
 CONF.register_opts([openstack_cfg.StrOpt('taskmanager_manager')])
 
-if __name__ == '__main__':
+
+def main():
     cfg.parse_args(sys.argv)
     logging.setup(None)
 
@@ -68,3 +69,7 @@ if __name__ == '__main__':
         import traceback
         print(traceback.format_exc())
         sys.exit("ERROR: %s" % error)
+
+
+if __name__ == '__main__':
+    main()