summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-03-16 03:16:34 +0000
committerGerrit Code Review <review@openstack.org>2012-03-16 03:16:34 +0000
commit3dce8e5e49ce3cb567ea234c63eb7b2c949e095f (patch)
tree788ad9ebd86065c4af51b38ca304b2d34760b4d2
parentddf1d6ae7e4445cc57f97f52f13c38ca0cc2cd74 (diff)
parent2d142f3b1ca2d9eb993cee7989ff5954a6cc815c (diff)
downloadnova-3dce8e5e49ce3cb567ea234c63eb7b2c949e095f.tar.gz
nova-3dce8e5e49ce3cb567ea234c63eb7b2c949e095f.tar.xz
nova-3dce8e5e49ce3cb567ea234c63eb7b2c949e095f.zip
Merge "Use getLogger for nova-all"
-rwxr-xr-xbin/nova-all6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/nova-all b/bin/nova-all
index beed333ce..94cafaa0c 100755
--- a/bin/nova-all
+++ b/bin/nova-all
@@ -48,6 +48,8 @@ from nova.objectstore import s3server
from nova.vnc import xvp_proxy
+LOG = logging.getLogger('nova.all')
+
if __name__ == '__main__':
utils.default_flagfile()
flags.FLAGS(sys.argv)
@@ -65,13 +67,13 @@ if __name__ == '__main__':
try:
servers.append(mod.get_wsgi_server())
except (Exception, SystemExit):
- logging.exception(_('Failed to load %s') % mod.__name__)
+ LOG.exception(_('Failed to load %s') % mod.__name__)
for binary in ['nova-compute', 'nova-volume',
'nova-network', 'nova-scheduler', 'nova-vsa', 'nova-cert']:
try:
servers.append(service.Service.create(binary=binary))
except (Exception, SystemExit):
- logging.exception(_('Failed to load %s' % binary))
+ LOG.exception(_('Failed to load %s' % binary))
service.serve(*servers)
service.wait()