Switch to common logging.

I only just moved logging from nova to common, so behavior should remain the same.

Change-Id: I1d7304ca200f9d024bb7244d25be2f9a670318fb

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()
 

bin/nova-api

@@ -37,13 +37,13 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
 
 
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import service
 from nova import utils
 
 if __name__ == '__main__':
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
     utils.monkey_patch()
     launcher = service.ProcessLauncher()
     for api in flags.FLAGS.enabled_apis:

bin/nova-api-ec2

@@ -33,13 +33,13 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
 
 
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import service
 from nova import utils
 
 if __name__ == '__main__':
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
     utils.monkey_patch()
     server = service.WSGIService('ec2')
     service.serve(server, workers=server.workers)

bin/nova-api-metadata

@@ -33,13 +33,13 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
 
 
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import service
 from nova import utils
 
 if __name__ == '__main__':
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
     utils.monkey_patch()
     server = service.WSGIService('metadata')
     service.serve(server, workers=server.workers)

bin/nova-api-os-compute

@@ -33,13 +33,13 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
 
 
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import service
 from nova import utils
 
 if __name__ == '__main__':
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
     utils.monkey_patch()
     server = service.WSGIService('osapi_compute')
     service.serve(server, workers=server.workers)

bin/nova-api-os-volume

@@ -33,13 +33,13 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
 
 
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import service
 from nova import utils
 
 if __name__ == '__main__':
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
     utils.monkey_patch()
     server = service.WSGIService('osapi_volume')
     service.serve(server, workers=server.workers)

bin/nova-cert

@@ -33,13 +33,13 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
 
 
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import service
 from nova import utils
 
 if __name__ == '__main__':
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
     utils.monkey_patch()
     server = service.Service.create(binary='nova-cert')
     service.serve(server)

bin/nova-clear-rabbit-queues

@@ -43,8 +43,8 @@ gettext.install('nova', unicode=1)
 from nova import context
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
+from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 
 
@@ -70,7 +70,7 @@ def delete_queues(queues):
 
 if __name__ == '__main__':
     args = flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
     delete_queues(args[1:])
     if FLAGS.delete_exchange:
         delete_exchange(FLAGS.control_exchange)

bin/nova-compute

@@ -35,13 +35,13 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
 
 
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import service
 from nova import utils
 
 if __name__ == '__main__':
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup('nova')
     utils.monkey_patch()
     server = service.Service.create(binary='nova-compute')
     service.serve(server)

bin/nova-console

@@ -34,12 +34,12 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 
 
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import service
 
 if __name__ == '__main__':
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
     server = service.Service.create(binary='nova-console')
     service.serve(server)
     service.wait()

bin/nova-consoleauth

@@ -33,13 +33,13 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 
 from nova.consoleauth import manager
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import service
 
 
 if __name__ == "__main__":
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
 
     server = service.Service.create(binary='nova-consoleauth')
     service.serve(server)

bin/nova-dhcpbridge

@@ -38,9 +38,9 @@ gettext.install('nova', unicode=1)
 from nova import context
 from nova import db
 from nova import flags
-from nova import log as logging
 from nova.network import linux_net
 from nova.openstack.common import importutils
+from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 from nova import utils
 
@@ -97,7 +97,7 @@ def main():
     """Parse environment and arguments and call the approproate action."""
     flagfile = os.environ.get('FLAGFILE', FLAGS.dhcpbridge_flagfile)
     argv = flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
 
     if int(os.environ.get('TESTING', '0')):
         from nova.tests import fake_flags

bin/nova-instance-usage-audit

@@ -55,7 +55,7 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 from nova import utils
 
@@ -65,7 +65,7 @@ FLAGS = flags.FLAGS
 if __name__ == '__main__':
     admin_context = context.get_admin_context()
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
     begin, end = utils.last_completed_audit_period()
     print "Starting instance usage audit"
     print "Creating usages for %s until %s" % (str(begin), str(end))

bin/nova-manage

@@ -86,10 +86,10 @@ from nova import db
 from nova.db import migration
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
+from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 from nova.openstack.common import timeutils
 from nova import quota
@@ -1667,7 +1667,7 @@ def main():
 
     try:
         argv = flags.parse_args(sys.argv)
-        logging.setup()
+        logging.setup("nova")
     except cfg.ConfigFilesNotFoundError:
         cfgfile = FLAGS.config_file[-1] if FLAGS.config_file else None
         if cfgfile and not os.access(cfgfile, os.R_OK):

bin/nova-network

@@ -35,13 +35,13 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 
 
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import service
 from nova import utils
 
 if __name__ == '__main__':
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
     utils.monkey_patch()
     server = service.Service.create(binary='nova-network')
     service.serve(server)

bin/nova-objectstore

@@ -35,15 +35,15 @@ 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
 
 
 if __name__ == '__main__':
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
     utils.monkey_patch()
     server = s3server.get_wsgi_server()
     service.serve(server)

bin/nova-rpc-zmq-receiver

@@ -45,7 +45,7 @@ CONF = cfg.CONF
 def main():
     CONF.register_opts(rpc.rpc_opts)
     impl_zmq.register_opts(CONF)
-    logging.setup()
+    logging.setup("nova")
     utils.monkey_patch()
 
     ipc_dir = CONF.rpc_zmq_ipc_dir

bin/nova-scheduler

@@ -37,13 +37,13 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 gettext.install('nova', unicode=1)
 
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import service
 from nova import utils
 
 if __name__ == '__main__':
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
     utils.monkey_patch()
     server = service.Service.create(binary='nova-scheduler')
     service.serve(server)

bin/nova-volume

@@ -35,13 +35,13 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 
 
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import service
 from nova import utils
 
 if __name__ == '__main__':
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
     utils.monkey_patch()
     server = service.Service.create(binary='nova-volume')
     service.serve(server)

bin/nova-volume-usage-audit

@@ -54,7 +54,7 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 from nova import utils
 from nova.volume import utils as volume_utils
@@ -65,7 +65,7 @@ if __name__ == '__main__':
     admin_context = context.get_admin_context()
     utils.default_cfgfile()
     flags.FLAGS(sys.argv)
-    logging.setup()
+    logging.setup("nova")
     begin, end = utils.last_completed_audit_period()
     print "Starting volume usage audit"
     print "Creating usages for %s until %s" % (str(begin), str(end))

bin/nova-xvpvncproxy

@@ -32,7 +32,7 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 
 
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 from nova import service
 from nova.vnc import xvp_proxy
@@ -41,7 +41,7 @@ FLAGS = flags.FLAGS
 
 if __name__ == "__main__":
     flags.parse_args(sys.argv)
-    logging.setup()
+    logging.setup("nova")
 
     wsgi_server = xvp_proxy.get_wsgi_server()
     service.serve(wsgi_server)

etc/nova/logging_sample.conf

@@ -70,7 +70,7 @@ formatter = default
 args = ()
 
 [formatter_legacynova]
-class = nova.log.LegacyNovaFormatter
+class = nova.log.LegacyFormatter
 
 [formatter_default]
 format = %(message)s

nova/api/auth.py

@@ -23,8 +23,8 @@ import webob.exc
 
 from nova import context
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
+from nova.openstack.common import log as logging
 from nova import wsgi
 
 

nova/api/ec2/__init__.py

@@ -34,10 +34,10 @@ from nova.api import validator
 from nova import context
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
+from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import utils
 from nova import wsgi

nova/api/ec2/apirequest.py

@@ -27,7 +27,7 @@ from xml.dom import minidom
 from nova.api.ec2 import ec2utils
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS

nova/api/ec2/cloud.py

@@ -37,9 +37,9 @@ from nova import db
 from nova import exception
 from nova import flags
 from nova.image import s3
-from nova import log as logging
 from nova import network
 from nova.openstack.common import excutils
+from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import quota
 from nova import utils

nova/api/ec2/ec2utils.py

@@ -22,8 +22,8 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova.network import model as network_model
+from nova.openstack.common import log as logging
 from nova import utils
 
 

nova/api/metadata/base.py

@@ -28,8 +28,8 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova import network
+from nova.openstack.common import log as logging
 from nova import volume
 
 FLAGS = flags.FLAGS

nova/api/metadata/handler.py

@@ -25,7 +25,7 @@ import webob.exc
 from nova.api.metadata import base
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import wsgi
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/__init__.py

@@ -25,7 +25,7 @@ import webob.dec
 import webob.exc
 
 from nova.api.openstack import wsgi
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import wsgi as base_wsgi
 
 

nova/api/openstack/auth.py

@@ -23,7 +23,7 @@ import webob.exc
 from nova.api.openstack import wsgi
 from nova import context
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import wsgi as base_wsgi
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/common.py

@@ -30,7 +30,7 @@ from nova.compute import utils as compute_utils
 from nova.compute import vm_states
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import quota
 
 

nova/api/openstack/compute/__init__.py

@@ -32,8 +32,8 @@ from nova.api.openstack.compute import server_metadata
 from nova.api.openstack.compute import servers
 from nova.api.openstack.compute import versions
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/__init__.py

@@ -23,7 +23,7 @@ It can't be called 'extensions' because that causes namespacing problems.
 
 from nova.api.openstack import extensions
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 FLAGS = flags.FLAGS

nova/api/openstack/compute/contrib/accounts.py

@@ -21,7 +21,7 @@ from nova.api.openstack import xmlutil
 from nova.auth import manager
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 FLAGS = flags.FLAGS

nova/api/openstack/compute/contrib/admin_actions.py

@@ -25,7 +25,7 @@ from nova import compute
 from nova.compute import vm_states
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 FLAGS = flags.FLAGS

nova/api/openstack/compute/contrib/aggregates.py

@@ -20,7 +20,7 @@ from webob import exc
 from nova.api.openstack import extensions
 from nova.compute import api as compute_api
 from nova import exception
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'aggregates')

nova/api/openstack/compute/contrib/certificates.py

@@ -21,8 +21,8 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 import nova.cert.rpcapi
 from nova import flags
-from nova import log as logging
 from nova import network
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/cloudpipe.py

@@ -27,8 +27,8 @@ from nova.compute import vm_states
 from nova import db
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova import network
+from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import utils
 

nova/api/openstack/compute/contrib/console_output.py

@@ -23,7 +23,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/consoles.py

@@ -20,7 +20,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/deferred_delete.py

@@ -22,7 +22,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/extended_server_attributes.py

@@ -20,7 +20,7 @@ from nova.api.openstack import xmlutil
 from nova import compute
 from nova import db
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 FLAGS = flags.FLAGS

nova/api/openstack/compute/contrib/extended_status.py

@@ -19,7 +19,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 FLAGS = flags.FLAGS

nova/api/openstack/compute/contrib/flavormanage.py

@@ -20,7 +20,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.compute import instance_types
 from nova import exception
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/floating_ip_dns.py

@@ -22,8 +22,8 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
-from nova import log as logging
 from nova import network
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/floating_ip_pools.py

@@ -17,8 +17,8 @@
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova import log as logging
 from nova import network
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/floating_ips.py

@@ -25,8 +25,8 @@ from nova.api.openstack import xmlutil
 from nova import compute
 from nova.compute import utils as compute_utils
 from nova import exception
-from nova import log as logging
 from nova import network
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/hosts.py

@@ -26,7 +26,7 @@ from nova.compute import api as compute_api
 from nova import db
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/hypervisors.py

@@ -22,7 +22,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import db
 from nova import exception
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/multinic.py

@@ -22,7 +22,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/networks.py

@@ -22,8 +22,8 @@ from webob import exc
 from nova.api.openstack import extensions
 from nova import exception
 from nova import flags
-from nova import log as logging
 import nova.network.api
+from nova.openstack.common import log as logging
 
 
 FLAGS = flags.FLAGS

nova/api/openstack/compute/contrib/rescue.py

@@ -23,7 +23,7 @@ from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import utils
 
 

nova/api/openstack/compute/contrib/scheduler_hints.py

@@ -18,7 +18,7 @@ import webob.exc
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
-import nova.log as logging
+import nova.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/api/openstack/compute/contrib/security_groups.py

@@ -29,8 +29,8 @@ from nova import compute
 from nova import db
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import excutils
+from nova.openstack.common import log as logging
 from nova import utils
 
 

nova/api/openstack/compute/contrib/server_start_stop.py

@@ -20,7 +20,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/users.py

@@ -22,7 +22,7 @@ from nova.api.openstack import xmlutil
 from nova.auth import manager
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 FLAGS = flags.FLAGS

nova/api/openstack/compute/contrib/virtual_interfaces.py

@@ -20,8 +20,8 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
-from nova import log as logging
 from nova import network
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/volumes.py

@@ -26,7 +26,7 @@ from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import volume
 from nova.volume import volume_types
 

nova/api/openstack/compute/extensions.py

@@ -17,7 +17,7 @@
 
 from nova.api.openstack import extensions as base_extensions
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/images.py

@@ -22,7 +22,7 @@ from nova.api.openstack import xmlutil
 from nova import exception
 from nova import flags
 import nova.image.glance
-from nova import log as logging
+from nova.openstack.common import log as logging
 import nova.utils
 
 

nova/api/openstack/compute/ips.py

@@ -23,7 +23,7 @@ from nova.api.openstack.compute.views import addresses as view_addresses
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/servers.py

@@ -31,7 +31,7 @@ from nova import compute
 from nova.compute import instance_types
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova.openstack.common.rpc import common as rpc_common
 from nova.openstack.common import timeutils
 from nova import utils

nova/api/openstack/compute/views/addresses.py

@@ -19,7 +19,7 @@ import itertools
 
 from nova.api.openstack import common
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 FLAGS = flags.FLAGS

nova/api/openstack/compute/views/servers.py

@@ -22,7 +22,7 @@ from nova.api.openstack import common
 from nova.api.openstack.compute.views import addresses as views_addresses
 from nova.api.openstack.compute.views import flavors as views_flavors
 from nova.api.openstack.compute.views import images as views_images
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 
 

nova/api/openstack/extensions.py

@@ -26,8 +26,8 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import importutils
+from nova.openstack.common import log as logging
 import nova.policy
 
 

nova/api/openstack/urlmap.py

@@ -20,7 +20,7 @@ import re
 import urllib2
 
 from nova.api.openstack import wsgi
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 _quoted_string_re = r'"[^"\\]*(?:\\.[^"\\]*)*"'

nova/api/openstack/volume/__init__.py

@@ -26,7 +26,7 @@ from nova.api.openstack.volume import snapshots
 from nova.api.openstack.volume import types
 from nova.api.openstack.volume import versions
 from nova.api.openstack.volume import volumes
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/volume/contrib/__init__.py

@@ -23,7 +23,7 @@ It can't be called 'extensions' because that causes namespacing problems.
 
 from nova.api.openstack import extensions
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 FLAGS = flags.FLAGS

nova/api/openstack/volume/extensions.py

@@ -17,7 +17,7 @@
 
 from nova.api.openstack import extensions as base_extensions
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/volume/snapshots.py

@@ -23,7 +23,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import volume
 
 

nova/api/openstack/volume/volumes.py

@@ -23,7 +23,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import volume
 from nova.volume import volume_types
 

nova/api/openstack/wsgi.py

@@ -25,8 +25,8 @@ from lxml import etree
 import webob
 
 from nova import exception
-from nova import log as logging
 from nova.openstack.common import jsonutils
+from nova.openstack.common import log as logging
 from nova import wsgi
 
 

nova/api/sizelimit.py

@@ -22,8 +22,8 @@ import webob.dec
 import webob.exc
 
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
+from nova.openstack.common import log as logging
 from nova import wsgi
 
 

nova/auth/ldapdriver.py

@@ -29,8 +29,8 @@ import sys
 
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
+from nova.openstack.common import log as logging
 
 
 ldap_opts = [

nova/auth/manager.py

@@ -34,9 +34,9 @@ from nova import crypto
 from nova import db
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
+from nova.openstack.common import log as logging
 from nova import utils
 
 

nova/auth/signer.py

@@ -59,7 +59,7 @@ except ImportError:
     boto = None
 
 from nova import exception
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/cert/manager.py

@@ -28,8 +28,8 @@ import base64
 
 from nova import crypto
 from nova import flags
-from nova import log as logging
 from nova import manager
+from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS

nova/cloudpipe/pipelib.py

@@ -34,8 +34,8 @@ from nova import crypto
 from nova import db
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
+from nova.openstack.common import log as logging
 from nova import utils
 
 

nova/common/deprecated.py

@@ -16,8 +16,8 @@
 
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
+from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/compute/api.py

@@ -40,12 +40,12 @@ from nova.db import base
 from nova import exception
 from nova import flags
 from nova.image import glance
-from nova import log as logging
 from nova import network
 from nova import notifications
 from nova.openstack.common import excutils
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
+from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 import nova.policy
 from nova import quota

nova/compute/instance_types.py

@@ -26,7 +26,7 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 FLAGS = flags.FLAGS
 LOG = logging.getLogger(__name__)

nova/compute/manager.py

@@ -58,7 +58,6 @@ import nova.context
 from nova import exception
 from nova import flags
 from nova.image import glance
-from nova import log as logging
 from nova import manager
 from nova import network
 from nova.network import model as network_model
@@ -68,6 +67,7 @@ from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
+from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 from nova.openstack.common import timeutils
 from nova import utils

nova/compute/utils.py

@@ -19,10 +19,10 @@
 from nova import db
 from nova import exception
 from nova import flags
-from nova import log
 from nova.network import model as network_model
 from nova import notifications
 from nova.notifier import api as notifier_api
+from nova.openstack.common import log
 
 
 FLAGS = flags.FLAGS

nova/console/manager.py

@@ -22,10 +22,10 @@ import socket
 from nova.compute import rpcapi as compute_rpcapi
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova import manager
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
+from nova.openstack.common import log as logging
 from nova import utils
 
 

nova/console/vmrc_manager.py

@@ -20,10 +20,10 @@
 from nova.compute import rpcapi as compute_rpcapi
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova import manager
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
+from nova.openstack.common import log as logging
 from nova.virt import vmwareapi_conn
 
 

nova/console/xvp.py

@@ -26,8 +26,8 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
+from nova.openstack.common import log as logging
 from nova import utils
 
 

nova/consoleauth/manager.py

@@ -21,10 +21,10 @@
 import time
 
 from nova import flags
-from nova import log as logging
 from nova import manager
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/context.py

@@ -21,8 +21,8 @@
 
 import copy
 
-from nova import log as logging
 from nova.openstack.common import local
+from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import utils
 

nova/crypto.py

@@ -35,8 +35,8 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
+from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import utils
 

nova/db/sqlalchemy/api.py

@@ -33,7 +33,7 @@ from nova.db.sqlalchemy import models
 from nova.db.sqlalchemy.session import get_session
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import utils
 from sqlalchemy import and_

nova/db/sqlalchemy/migrate_repo/versions/082_essex.py

@@ -19,7 +19,7 @@ from sqlalchemy import Boolean, BigInteger, Column, DateTime, Float, ForeignKey
 from sqlalchemy import Index, Integer, MetaData, String, Table, Text
 
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 FLAGS = flags.FLAGS
 

nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py

@@ -17,7 +17,7 @@
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import MetaData, Integer, String, Table
 
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/db/sqlalchemy/migrate_repo/versions/087_add_uuid_to_bw_usage_cache.py

@@ -17,7 +17,7 @@
 from sqlalchemy import Boolean, Column, DateTime, BigInteger
 from sqlalchemy import MetaData, Integer, String, Table
 
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py

@@ -20,7 +20,7 @@ from migrate import ForeignKeyConstraint
 from sqlalchemy import MetaData, String, Table
 from sqlalchemy import select, Column, ForeignKey, Integer
 
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py

@@ -18,7 +18,7 @@
 from sqlalchemy import Boolean, Column, DateTime, Integer
 from sqlalchemy import MetaData, String, Table
 
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import utils
 
 LOG = logging.getLogger(__name__)

nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py

@@ -19,7 +19,8 @@ from migrate import ForeignKeyConstraint
 from sqlalchemy import Integer
 from sqlalchemy import MetaData, String, Table
 
-from nova import log as logging
+from migrate import ForeignKeyConstraint
+from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/db/sqlalchemy/migrate_repo/versions/091_convert_volume_ids_to_uuid.py

@@ -17,7 +17,7 @@
 
 from sqlalchemy import MetaData, select, Table
 
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py

@@ -18,7 +18,7 @@
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer
 from sqlalchemy import MetaData, String, Table
 
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py

@@ -20,7 +20,7 @@ from migrate import ForeignKeyConstraint
 from sqlalchemy import MetaData, Integer, String, Table
 from sqlalchemy import select, Column
 
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)