← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

Viewing changes to bin/nova-api

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-07-06 10:18:33 UTC
  • mfrom: (1.1.58)
  • Revision ID: package-import@ubuntu.com-20120706101833-wp2nv392mpe9re8p
Tags: 2012.2~f2-0ubuntu1
[ Adam Gandelman ]
* Use new rootwrap configuration structure:
  - debian/nova-{compute, network, volume}.{pyinstall, pyremove}: Dropped.
  - debian/nova-common.dirs: Add /etc/nova/rootwrap.d/.
  - debian/nova-common.install: Install /etc/nova/rootwrap.conf.
  - debian/debian/nova.conf: Reference rootwrap.conf in calls to
    nova-rootwrap.
  - debian/nova-{compute, network, volume}.install: Install corresponding
    filter in /etc/nova/rootwrap.d/
* debian/rules: Install logging_sample.conf to /etc/nova/logging.conf
  as part of nova-common.
* debian/pydist-overrides: Add setuptools-git.
* debian/control: Add python-setuptools-git as a Build-Depends.
* debian/rules: Do not remove nova.egg-info during auto_clean.  Now that
  upstream has moved to setuptools-git, doing so results in missing files
  from built package.

[ Chuck Short ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/nova-api
24
24
"""
25
25
 
26
26
import eventlet
27
 
eventlet.monkey_patch()
 
27
eventlet.monkey_patch(os=False)
28
28
 
29
29
import os
30
30
import sys
37
37
 
38
38
 
39
39
from nova import flags
40
 
from nova import log as logging
 
40
from nova.openstack.common import log as logging
41
41
from nova import service
42
42
from nova import utils
43
43
 
44
44
if __name__ == '__main__':
45
45
    flags.parse_args(sys.argv)
46
 
    logging.setup()
 
46
    logging.setup("nova")
47
47
    utils.monkey_patch()
48
 
    servers = []
 
48
    launcher = service.ProcessLauncher()
49
49
    for api in flags.FLAGS.enabled_apis:
50
 
        servers.append(service.WSGIService(api))
51
 
    service.serve(*servers)
52
 
    service.wait()
 
50
        server = service.WSGIService(api)
 
51
        launcher.launch_server(server, workers=server.workers or 1)
 
52
    launcher.wait()