summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gundlach <michael.gundlach@rackspace.com>2010-09-23 10:05:49 -0400
committerMichael Gundlach <michael.gundlach@rackspace.com>2010-09-23 10:05:49 -0400
commit7aae55db904f9ed648cb80f78a9d4d8f266b4eaf (patch)
tree7852809699cd9b73d555ec0c4e59d34293738996
parent24f589d421be9a15ad941c34128b4fa0bdc28db4 (diff)
parentebf71b08efc6ab3c590f71715aa16b925f17c38e (diff)
Merge lp:~soren/nova/nova-api-new-daemonize
-rwxr-xr-xbin/nova-api-new13
1 files changed, 9 insertions, 4 deletions
diff --git a/bin/nova-api-new b/bin/nova-api-new
index 6f25ad8c7..a5027700b 100755
--- a/bin/nova-api-new
+++ b/bin/nova-api-new
@@ -32,13 +32,18 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir)
-from nova import api
from nova import flags
-from nova import wsgi
+from nova import utils
+from nova import server
FLAGS = flags.FLAGS
flags.DEFINE_integer('api_port', 8773, 'API port')
-if __name__ == '__main__':
- FLAGS(sys.argv)
+def main(_args):
+ from nova import api
+ from nova import wsgi
wsgi.run_server(api.API(), FLAGS.api_port)
+
+if __name__ == '__main__':
+ utils.default_flagfile()
+ server.serve('nova-api', main)