diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2011-02-25 01:31:02 +0000 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2011-02-25 01:31:02 +0000 |
| commit | c8345c9ebc0357f1fe06ac520f286f036cb0596c (patch) | |
| tree | 197e6c852db619cf03800a77585637d8671d3d71 /nova/twistd.py | |
| parent | 05d135be0c0d8a90a97d62005a101345964800cf (diff) | |
| parent | c8b630a78e955756e77be8879c1da863a5357ea0 (diff) | |
| download | nova-c8345c9ebc0357f1fe06ac520f286f036cb0596c.tar.gz nova-c8345c9ebc0357f1fe06ac520f286f036cb0596c.tar.xz nova-c8345c9ebc0357f1fe06ac520f286f036cb0596c.zip | |
Merging trunk, small fixes
Diffstat (limited to 'nova/twistd.py')
| -rw-r--r-- | nova/twistd.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/twistd.py b/nova/twistd.py index 60ff7879a..c07ed991f 100644 --- a/nova/twistd.py +++ b/nova/twistd.py @@ -148,6 +148,7 @@ def WrapTwistedOptions(wrapped): options.insert(0, '') args = FLAGS(options) + logging.setup() argv = args[1:] # ignore subcommands @@ -258,7 +259,6 @@ def serve(filename): print 'usage: %s [options] [start|stop|restart]' % argv[0] sys.exit(1) - logging.basicConfig() logging.debug(_("Full set of FLAGS:")) for flag in FLAGS: logging.debug("%s : %s" % (flag, FLAGS.get(flag, None))) |