From 6cdee8590528a95e9e3c7f2fc156cc9ebb8b39b2 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Wed, 17 Aug 2011 16:25:53 -0700
Subject: Make all services use the same launching strategy

---
 bin/nova-api | 44 +++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

(limited to 'bin/nova-api')

diff --git a/bin/nova-api b/bin/nova-api
index fe8e83366..d2086dc92 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -19,12 +19,15 @@
 
 """Starter script for Nova API.
 
-Starts both the EC2 and OpenStack APIs in separate processes.
+Starts both the EC2 and OpenStack APIs in separate greenthreads.
 
 """
 
+import eventlet
+eventlet.monkey_patch()
+
+import gettext
 import os
-import signal
 import sys
 
 
@@ -33,32 +36,19 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
 if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
     sys.path.insert(0, possible_topdir)
 
-import nova.service
-import nova.utils
+gettext.install('nova', unicode=1)
 
 from nova import flags
-
-
-FLAGS = flags.FLAGS
-
-
-def main():
-    """Launch EC2 and OSAPI services."""
-    nova.utils.Bootstrapper.bootstrap_binary(sys.argv)
-
-    launcher = nova.service.Launcher()
-
-    for api in FLAGS.enabled_apis:
-        service = nova.service.WSGIService(api)
-        launcher.launch_service(service)
-
-    signal.signal(signal.SIGTERM, lambda *_: launcher.stop())
-
-    try:
-        launcher.wait()
-    except KeyboardInterrupt:
-        launcher.stop()
-
+from nova import log as logging
+from nova import service
+from nova import utils
 
 if __name__ == '__main__':
-    sys.exit(main())
+    utils.default_flagfile()
+    flags.FLAGS(sys.argv)
+    logging.setup()
+    services = []
+    for api in flags.FLAGS.enabled_apis:
+        services.append(service.WSGIService(api))
+    service.serve(*services)
+    service.wait()
-- 
cgit 


From 125a2affec7713cdbcb925537d34aea29a2e4230 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Thu, 18 Aug 2011 10:55:39 -0700
Subject: more cleanup of binaries per review

---
 bin/nova-api | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'bin/nova-api')

diff --git a/bin/nova-api b/bin/nova-api
index d2086dc92..38e2624d8 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -26,7 +26,6 @@ Starts both the EC2 and OpenStack APIs in separate greenthreads.
 import eventlet
 eventlet.monkey_patch()
 
-import gettext
 import os
 import sys
 
@@ -36,7 +35,6 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
 if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
     sys.path.insert(0, possible_topdir)
 
-gettext.install('nova', unicode=1)
 
 from nova import flags
 from nova import log as logging
@@ -47,8 +45,8 @@ if __name__ == '__main__':
     utils.default_flagfile()
     flags.FLAGS(sys.argv)
     logging.setup()
-    services = []
+    servers = []
     for api in flags.FLAGS.enabled_apis:
-        services.append(service.WSGIService(api))
-    service.serve(*services)
+        servers.append(service.WSGIService(api))
+    service.serve(*servers)
     service.wait()
-- 
cgit