summaryrefslogtreecommitdiff
path: root/bin/nova-all
diff options
context:
space:
mode:
Diffstat (limited to 'bin/nova-all')
-rwxr-xr-xbin/nova-all4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/nova-all b/bin/nova-all
index 6aee878056..a67c77b99d 100755
--- a/bin/nova-all
+++ b/bin/nova-all
@@ -41,8 +41,8 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
from nova import flags
-from nova import log as logging
from nova.objectstore import s3server
+from nova.openstack.common import log as logging
from nova import service
from nova import utils
from nova.vnc import xvp_proxy
@@ -52,7 +52,7 @@ LOG = logging.getLogger('nova.all')
if __name__ == '__main__':
flags.parse_args(sys.argv)
- logging.setup()
+ logging.setup("nova")
utils.monkey_patch()
launcher = service.ProcessLauncher()