1
=== modified file 'bin/nova-api-new'
2
--- bin/nova-api-new	2010-09-23 13:13:27 +0000
3
+++ bin/nova-api-new	2010-09-23 13:58:41 +0000
4
@@ -32,13 +32,18 @@
5
32
if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
32
if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
6
33
    sys.path.insert(0, possible_topdir)
33
    sys.path.insert(0, possible_topdir)
7
34
34
8
35
from nova import api
9
36
from nova import flags
35
from nova import flags
11
37
from nova import wsgi
36
from nova import utils
12
37
from nova import server
13
38
38
14
39
FLAGS = flags.FLAGS
39
FLAGS = flags.FLAGS
15
40
flags.DEFINE_integer('api_port', 8773, 'API port')
40
flags.DEFINE_integer('api_port', 8773, 'API port')
16
41
41
17
42
def main(_args):
18
43
    from nova import api
19
44
    from nova import wsgi
20
45
    wsgi.run_server(api.API(), FLAGS.api_port)
21
46
22
42
if __name__ == '__main__':
47
if __name__ == '__main__':
25
43
    FLAGS(sys.argv)
48
    utils.default_flagfile()
26
44
    wsgi.run_server(api.API(), FLAGS.api_port)
49
    server.serve('nova-api', main)
Status:	Merged
Approved by:	Michael Gundlach on 2010-09-23
Approved revision:	309
Merge reported by:	Michael Gundlach
Merged at revision:	not available
Proposed branch:	lp:~soren/nova/nova-api-new-daemonise
Merge into:	lp:~gundlach/nova/controllers-in-api
Diff against target:	26 lines (+9/-4) 1 file modified bin/nova-api-new (+9/-4)
To merge this branch:	bzr merge lp:~soren/nova/nova-api-new-daemonise
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michael Gundlach		2010-09-23	Approve on 2010-09-23
Review via email: mp+36444@code.launchpad.net