summaryrefslogtreecommitdiffstats
path: root/bin/nova-api
diff options
context:
space:
mode:
authorEric Day <eday@oddments.org>2010-09-23 11:24:26 -0700
committerEric Day <eday@oddments.org>2010-09-23 11:24:26 -0700
commit6460a2e9f808c2200274fc41777b6ceaed182d82 (patch)
tree4ec9abff5810e5049c6d85dab6c896fdfac885b1 /bin/nova-api
parentc9ac49b2425b932f60a87da80887d4556806ca60 (diff)
parentc29c68f0fa27fa81f22ca42958bbd564f719f3ae (diff)
Merged gundlach's branch.
Diffstat (limited to 'bin/nova-api')
-rwxr-xr-xbin/nova-api10
1 files changed, 7 insertions, 3 deletions
diff --git a/bin/nova-api b/bin/nova-api
index 8625c487f..a5027700b 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -32,14 +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 utils
-from nova import wsgi
+from nova import server
FLAGS = flags.FLAGS
flags.DEFINE_integer('api_port', 8773, 'API port')
+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()
- wsgi.run_server(api.API(), FLAGS.api_port)
+ server.serve('nova-api', main)