Standardize logging delaration and use

* Make modules use getLogger(__name__) and log to the result

Change-Id: Ib6d69b4be140ec89affc86ed11e65e422d551df1

51 files changed, 53 insertions, 53 deletions

diff --git a/nova/api/auth.py b/nova/api/auth.py
index c01d968cf..e6ad8555f 100644
--- a/nova/api/auth.py
+++ b/nova/api/auth.py
@@ -35,6 +35,7 @@ use_forwarded_for_opt = cfg.BoolOpt('use_forwarded_for',
 
 FLAGS = flags.FLAGS
 FLAGS.register_opt(use_forwarded_for_opt)
+LOG = logging.getLogger(__name__)
 
 
 class InjectContext(wsgi.Middleware):
@@ -58,7 +59,7 @@ class NovaKeystoneContext(wsgi.Middleware):
         user_id = req.headers.get('X_USER')
         user_id = req.headers.get('X_USER_ID', user_id)
         if user_id is None:
-            logging.debug("Neither X_USER_ID nor X_USER found in request")
+            LOG.debug("Neither X_USER_ID nor X_USER found in request")
             return webob.exc.HTTPUnauthorized()
         # get the roles
         roles = [r.strip() for r in req.headers.get('X_ROLE', '').split(',')]
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index d5d84ff6f..ddb3a2044 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -41,7 +41,7 @@ from nova import utils
 from nova import wsgi
 
 
-LOG = logging.getLogger("nova.api")
+LOG = logging.getLogger(__name__)
 
 ec2_opts = [
     cfg.IntOpt('lockout_attempts',
diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py
index 01ea19628..809883299 100644
--- a/nova/api/ec2/apirequest.py
+++ b/nova/api/ec2/apirequest.py
@@ -29,7 +29,7 @@ from nova import exception
 from nova import flags
 from nova import log as logging
 
-LOG = logging.getLogger("nova.api.request")
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 
 
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 7a821699b..5ac69b1a7 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -48,7 +48,7 @@ from nova import volume
 FLAGS = flags.FLAGS
 flags.DECLARE('dhcp_domain', 'nova.network.manager')
 
-LOG = logging.getLogger("nova.api.ec2.cloud")
+LOG = logging.getLogger(__name__)
 
 
 def _gen_key(context, user_id, key_name):
diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py
index 8a08b172a..d0e9e81d9 100644
--- a/nova/api/ec2/ec2utils.py
+++ b/nova/api/ec2/ec2utils.py
@@ -26,7 +26,7 @@ from nova.network import model as network_model
 
 
 FLAGS = flags.FLAGS
-LOG = logging.getLogger("nova.api.ec2.ec2utils")
+LOG = logging.getLogger(__name__)
 
 
 def image_type(image_type):
diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py
index a6bab8c2a..4b47f7b70 100644
--- a/nova/api/metadata/handler.py
+++ b/nova/api/metadata/handler.py
@@ -36,7 +36,7 @@ from nova import volume
 from nova import wsgi
 
 
-LOG = logging.getLogger('nova.api.metadata')
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 flags.DECLARE('use_forwarded_for', 'nova.api.auth')
 flags.DECLARE('dhcp_domain', 'nova.network.manager')
diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 135a8c75b..a12f1fc03 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -29,7 +29,7 @@ from nova import log as logging
 from nova import wsgi as base_wsgi
 
 
-LOG = logging.getLogger('nova.api.openstack')
+LOG = logging.getLogger(__name__)
 
 
 class FaultWrapper(base_wsgi.Middleware):
diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py
index 84e0b16ca..c404c72af 100644
--- a/nova/api/openstack/auth.py
+++ b/nova/api/openstack/auth.py
@@ -32,7 +32,7 @@ from nova import log as logging
 from nova import utils
 from nova import wsgi as base_wsgi
 
-LOG = logging.getLogger('nova.api.openstack.compute.auth')
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 flags.DECLARE('use_forwarded_for', 'nova.api.auth')
 
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index e5231c483..4305de950 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -35,7 +35,7 @@ from nova.network import model as network_model
 from nova import quota
 
 
-LOG = logging.getLogger('nova.api.openstack.common')
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 
 
diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py
index e23fe7b87..2c6a3ce39 100644
--- a/nova/api/openstack/compute/__init__.py
+++ b/nova/api/openstack/compute/__init__.py
@@ -36,7 +36,7 @@ from nova import log as logging
 from nova.openstack.common import cfg
 
 
-LOG = logging.getLogger('nova.api.openstack.compute')
+LOG = logging.getLogger(__name__)
 
 allow_instance_snapshots_opt = \
     cfg.BoolOpt('allow_instance_snapshots',
diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py
index eaa9557af..c9f61ae00 100644
--- a/nova/api/openstack/compute/contrib/__init__.py
+++ b/nova/api/openstack/compute/contrib/__init__.py
@@ -27,7 +27,7 @@ from nova.api.openstack import extensions
 
 
 FLAGS = flags.FLAGS
-LOG = logging.getLogger('nova.api.openstack.compute.contrib')
+LOG = logging.getLogger(__name__)
 
 
 def standard_extensions(ext_mgr):
diff --git a/nova/api/openstack/compute/contrib/accounts.py b/nova/api/openstack/compute/contrib/accounts.py
index 939912942..1498ed1c5 100644
--- a/nova/api/openstack/compute/contrib/accounts.py
+++ b/nova/api/openstack/compute/contrib/accounts.py
@@ -25,7 +25,7 @@ from nova import log as logging
 
 
 FLAGS = flags.FLAGS
-LOG = logging.getLogger('nova.api.openstack.compute.contrib.accounts')
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'accounts')
 
 
diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py
index a61150958..69340648b 100644
--- a/nova/api/openstack/compute/contrib/admin_actions.py
+++ b/nova/api/openstack/compute/contrib/admin_actions.py
@@ -29,7 +29,7 @@ from nova.scheduler import api as scheduler_api
 
 
 FLAGS = flags.FLAGS
-LOG = logging.getLogger("nova.api.openstack.compute.contrib.admin_actions")
+LOG = logging.getLogger(__name__)
 
 
 def authorize(context, action_name):
diff --git a/nova/api/openstack/compute/contrib/aggregates.py b/nova/api/openstack/compute/contrib/aggregates.py
index c0b0001e6..6206f42c4 100644
--- a/nova/api/openstack/compute/contrib/aggregates.py
+++ b/nova/api/openstack/compute/contrib/aggregates.py
@@ -23,7 +23,7 @@ from nova import exception
 from nova import log as logging
 
 
-LOG = logging.getLogger("nova.api.openstack.compute.contrib.host_aggregates")
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'aggregates')
 
 
diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py
index 6805daec6..11e1480a2 100644
--- a/nova/api/openstack/compute/contrib/certificates.py
+++ b/nova/api/openstack/compute/contrib/certificates.py
@@ -25,7 +25,7 @@ from nova import network
 from nova import rpc
 
 
-LOG = logging.getLogger('nova.api.openstack.compute.contrib.certificates')
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 authorize = extensions.extension_authorizer('compute', 'certificates')
 
diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py
index 9d944366b..d5a975840 100644
--- a/nova/api/openstack/compute/contrib/cloudpipe.py
+++ b/nova/api/openstack/compute/contrib/cloudpipe.py
@@ -31,7 +31,7 @@ from nova import utils
 
 
 FLAGS = flags.FLAGS
-LOG = logging.getLogger("nova.api.openstack.compute.contrib.cloudpipe")
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'cloudpipe')
 
 
diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py
index 04f975d5b..a9db43358 100644
--- a/nova/api/openstack/compute/contrib/console_output.py
+++ b/nova/api/openstack/compute/contrib/console_output.py
@@ -25,7 +25,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 
 
-LOG = logging.getLogger('nova.api.openstack.compute.contrib.console_output')
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'console_output')
 
 
diff --git a/nova/api/openstack/compute/contrib/consoles.py b/nova/api/openstack/compute/contrib/consoles.py
index c3509e7a8..7cf757fd1 100644
--- a/nova/api/openstack/compute/contrib/consoles.py
+++ b/nova/api/openstack/compute/contrib/consoles.py
@@ -23,7 +23,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 
 
-LOG = logging.getLogger('nova.api.openstack.compute.contrib.console')
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'consoles')
 
 
diff --git a/nova/api/openstack/compute/contrib/deferred_delete.py b/nova/api/openstack/compute/contrib/deferred_delete.py
index 10f776558..7752871de 100644
--- a/nova/api/openstack/compute/contrib/deferred_delete.py
+++ b/nova/api/openstack/compute/contrib/deferred_delete.py
@@ -25,7 +25,7 @@ from nova import exception
 from nova import log as logging
 
 
-LOG = logging.getLogger("nova.api.openstack.compute.contrib.deferred-delete")
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'deferred_delete')
 
 
diff --git a/nova/api/openstack/compute/contrib/extended_status.py b/nova/api/openstack/compute/contrib/extended_status.py
index d68dee4e2..55e4a3aee 100644
--- a/nova/api/openstack/compute/contrib/extended_status.py
+++ b/nova/api/openstack/compute/contrib/extended_status.py
@@ -26,7 +26,7 @@ from nova import log as logging
 
 
 FLAGS = flags.FLAGS
-LOG = logging.getLogger("nova.api.openstack.compute.contrib.extendedstatus")
+LOG = logging.getLogger(__name__)
 authorize = extensions.soft_extension_authorizer('compute', 'extended_status')
 
 
diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py
index d1dcee458..9aa86a8e0 100644
--- a/nova/api/openstack/compute/contrib/flavormanage.py
+++ b/nova/api/openstack/compute/contrib/flavormanage.py
@@ -23,7 +23,7 @@ from nova import exception
 from nova import log as logging
 
 
-LOG = logging.getLogger('nova.api.openstack.compute.contrib.flavormanage')
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'flavormanage')
 
 
diff --git a/nova/api/openstack/compute/contrib/floating_ip_dns.py b/nova/api/openstack/compute/contrib/floating_ip_dns.py
index dbdd0c3a9..8bdac54b1 100644
--- a/nova/api/openstack/compute/contrib/floating_ip_dns.py
+++ b/nova/api/openstack/compute/contrib/floating_ip_dns.py
@@ -26,7 +26,7 @@ from nova import log as logging
 from nova import network
 
 
-LOG = logging.getLogger('nova.api.openstack.compute.contrib.floating_ip_dns')
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'floating_ip_dns')
 
 
diff --git a/nova/api/openstack/compute/contrib/floating_ip_pools.py b/nova/api/openstack/compute/contrib/floating_ip_pools.py
index 574ef26b0..39348db6e 100644
--- a/nova/api/openstack/compute/contrib/floating_ip_pools.py
+++ b/nova/api/openstack/compute/contrib/floating_ip_pools.py
@@ -21,7 +21,7 @@ from nova import log as logging
 from nova import network
 
 
-LOG = logging.getLogger('nova.api.openstack.compute.contrib.floating_ip_pools')
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'floating_ip_pools')
 
 
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py
index 46e2fe6fd..291d09554 100644
--- a/nova/api/openstack/compute/contrib/floating_ips.py
+++ b/nova/api/openstack/compute/contrib/floating_ips.py
@@ -29,7 +29,7 @@ from nova import network
 from nova import rpc
 
 
-LOG = logging.getLogger('nova.api.openstack.compute.contrib.floating_ips')
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'floating_ips')
 
 
diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py
index 6eee93e7b..cbb5e6902 100644
--- a/nova/api/openstack/compute/contrib/hosts.py
+++ b/nova/api/openstack/compute/contrib/hosts.py
@@ -30,7 +30,7 @@ from nova import log as logging
 from nova.scheduler import api as scheduler_api
 
 
-LOG = logging.getLogger("nova.api.openstack.compute.contrib.hosts")
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 authorize = extensions.extension_authorizer('compute', 'hosts')
 
diff --git a/nova/api/openstack/compute/contrib/multinic.py b/nova/api/openstack/compute/contrib/multinic.py
index a3b4a8dc8..061a6d3b1 100644
--- a/nova/api/openstack/compute/contrib/multinic.py
+++ b/nova/api/openstack/compute/contrib/multinic.py
@@ -25,7 +25,7 @@ from nova import exception
 from nova import log as logging
 
 
-LOG = logging.getLogger("nova.api.openstack.compute.contrib.multinic")
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'multinic')
 
 
diff --git a/nova/api/openstack/compute/contrib/networks.py b/nova/api/openstack/compute/contrib/networks.py
index 765a1d2fe..0735c9bb3 100644
--- a/nova/api/openstack/compute/contrib/networks.py
+++ b/nova/api/openstack/compute/contrib/networks.py
@@ -27,7 +27,7 @@ import nova.network.api
 
 
 FLAGS = flags.FLAGS
-LOG = logging.getLogger('nova.api.openstack.compute.contrib.networks')
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'networks')
 
 
diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py
index e5fbb8388..bd2d09162 100644
--- a/nova/api/openstack/compute/contrib/rescue.py
+++ b/nova/api/openstack/compute/contrib/rescue.py
@@ -27,7 +27,7 @@ from nova import utils
 
 
 FLAGS = flags.FLAGS
-LOG = logging.getLogger("nova.api.openstack.compute.contrib.rescue")
+LOG = logging.getLogger(__name__)
 authorize = exts.extension_authorizer('compute', 'rescue')
 
 
diff --git a/nova/api/openstack/compute/contrib/scheduler_hints.py b/nova/api/openstack/compute/contrib/scheduler_hints.py
index ef665da27..d5c9a25de 100644
--- a/nova/api/openstack/compute/contrib/scheduler_hints.py
+++ b/nova/api/openstack/compute/contrib/scheduler_hints.py
@@ -20,7 +20,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 import nova.log as logging
 
-LOG = logging.getLogger('nova.api.openstack.compute.contrib.scheduler_hints')
+LOG = logging.getLogger(__name__)
 
 
 class SchedulerHintsController(wsgi.Controller):
diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py
index 1faa0537a..e1e5a47fe 100644
--- a/nova/api/openstack/compute/contrib/security_groups.py
+++ b/nova/api/openstack/compute/contrib/security_groups.py
@@ -33,7 +33,7 @@ from nova import log as logging
 from nova import utils
 
 
-LOG = logging.getLogger("nova.api.openstack.compute.contrib.security_groups")
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 authorize = extensions.extension_authorizer('compute', 'security_groups')
 
diff --git a/nova/api/openstack/compute/contrib/server_start_stop.py b/nova/api/openstack/compute/contrib/server_start_stop.py
index 5f26c7dac..9bf71fdc5 100644
--- a/nova/api/openstack/compute/contrib/server_start_stop.py
+++ b/nova/api/openstack/compute/contrib/server_start_stop.py
@@ -23,7 +23,7 @@ from nova import exception
 from nova import log as logging
 
 
-LOG = logging.getLogger('nova.api.openstack.compute.contrib.server_start_stop')
+LOG = logging.getLogger(__name__)
 
 
 class ServerStartStopActionController(wsgi.Controller):
diff --git a/nova/api/openstack/compute/contrib/users.py b/nova/api/openstack/compute/contrib/users.py
index b2a97f327..8eb9b9c5b 100644
--- a/nova/api/openstack/compute/contrib/users.py
+++ b/nova/api/openstack/compute/contrib/users.py
@@ -26,7 +26,7 @@ from nova import log as logging
 
 
 FLAGS = flags.FLAGS
-LOG = logging.getLogger('nova.api.openstack.users')
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'users')
 
 
diff --git a/nova/api/openstack/compute/contrib/virtual_interfaces.py b/nova/api/openstack/compute/contrib/virtual_interfaces.py
index 9cf31e669..eee90ca7d 100644
--- a/nova/api/openstack/compute/contrib/virtual_interfaces.py
+++ b/nova/api/openstack/compute/contrib/virtual_interfaces.py
@@ -24,8 +24,7 @@ from nova import log as logging
 from nova import network
 
 
-LOG = logging.getLogger("nova.api.openstack.compute."
-                        "contrib.virtual_interfaces")
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'virtual_interfaces')
 
 
diff --git a/nova/api/openstack/compute/contrib/virtual_storage_arrays.py b/nova/api/openstack/compute/contrib/virtual_storage_arrays.py
index ed4b12a92..34e181cc7 100644
--- a/nova/api/openstack/compute/contrib/virtual_storage_arrays.py
+++ b/nova/api/openstack/compute/contrib/virtual_storage_arrays.py
@@ -38,7 +38,7 @@ from nova import volume
 
 
 FLAGS = flags.FLAGS
-LOG = logging.getLogger("nova.api.openstack.compute.contrib.vsa")
+LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute',
         'virtual_storage_arrays')
 
diff --git a/nova/api/openstack/compute/contrib/volumes.py b/nova/api/openstack/compute/contrib/volumes.py
index e235ad0fe..6532753c5 100644
--- a/nova/api/openstack/compute/contrib/volumes.py
+++ b/nova/api/openstack/compute/contrib/volumes.py
@@ -31,7 +31,7 @@ from nova import volume
 from nova.volume import volume_types
 
 
-LOG = logging.getLogger("nova.api.openstack.compute.contrib.volumes")
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 authorize = extensions.extension_authorizer('compute', 'volumes')
 
diff --git a/nova/api/openstack/compute/contrib/zones.py b/nova/api/openstack/compute/contrib/zones.py
index fac3d7188..8db16f235 100644
--- a/nova/api/openstack/compute/contrib/zones.py
+++ b/nova/api/openstack/compute/contrib/zones.py
@@ -32,7 +32,7 @@ from nova import log as logging
 import nova.scheduler.api
 
 
-LOG = logging.getLogger("nova.api.openstack.compute.contrib.zones")
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 authorize = extensions.extension_authorizer('compute', 'zones')
 
diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py
index 4789890c7..b52e89ab5 100644
--- a/nova/api/openstack/compute/extensions.py
+++ b/nova/api/openstack/compute/extensions.py
@@ -20,7 +20,7 @@ from nova import flags
 from nova import log as logging
 
 
-LOG = logging.getLogger('nova.api.openstack.compute.extensions')
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 
 
diff --git a/nova/api/openstack/compute/images.py b/nova/api/openstack/compute/images.py
index 76022a627..51d833e1f 100644
--- a/nova/api/openstack/compute/images.py
+++ b/nova/api/openstack/compute/images.py
@@ -23,11 +23,11 @@ from nova import compute
 from nova import exception
 from nova import flags
 import nova.image
-from nova import log
+from nova import log as logging
 import nova.utils
 
 
-LOG = log.getLogger('nova.api.openstack.compute.images')
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 
 SUPPORTED_FILTERS = {
diff --git a/nova/api/openstack/compute/ips.py b/nova/api/openstack/compute/ips.py
index 7e8b5ac67..94b2ce895 100644
--- a/nova/api/openstack/compute/ips.py
+++ b/nova/api/openstack/compute/ips.py
@@ -26,7 +26,7 @@ from nova import log as logging
 from nova import flags
 
 
-LOG = logging.getLogger('nova.api.openstack.compute.ips')
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 
 
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 42f4490c5..b55e8c6a3 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -37,7 +37,7 @@ from nova.scheduler import api as scheduler_api
 from nova import utils
 
 
-LOG = logging.getLogger('nova.api.openstack.compute.servers')
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 
 
diff --git a/nova/api/openstack/compute/views/addresses.py b/nova/api/openstack/compute/views/addresses.py
index 5a633a10c..794feb5ba 100644
--- a/nova/api/openstack/compute/views/addresses.py
+++ b/nova/api/openstack/compute/views/addresses.py
@@ -23,7 +23,7 @@ from nova import log as logging
 
 
 FLAGS = flags.FLAGS
-LOG = logging.getLogger('nova.api.openstack.compute.views.addresses')
+LOG = logging.getLogger(__name__)
 
 
 class ViewBuilder(common.ViewBuilder):
diff --git a/nova/api/openstack/compute/views/servers.py b/nova/api/openstack/compute/views/servers.py
index b226dc33f..f3fbee11f 100644
--- a/nova/api/openstack/compute/views/servers.py
+++ b/nova/api/openstack/compute/views/servers.py
@@ -26,7 +26,7 @@ from nova import log as logging
 from nova import utils
 
 
-LOG = logging.getLogger('nova.api.openstack.compute.views.servers')
+LOG = logging.getLogger(__name__)
 
 
 class ViewBuilder(common.ViewBuilder):
diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py
index 52559278e..8d04b017f 100644
--- a/nova/api/openstack/extensions.py
+++ b/nova/api/openstack/extensions.py
@@ -34,7 +34,7 @@ from nova import utils
 from nova import wsgi as base_wsgi
 
 
-LOG = logging.getLogger('nova.api.openstack.extensions')
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 
 
diff --git a/nova/api/openstack/urlmap.py b/nova/api/openstack/urlmap.py
index 825a12af2..dc94a28c5 100644
--- a/nova/api/openstack/urlmap.py
+++ b/nova/api/openstack/urlmap.py
@@ -28,7 +28,7 @@ _option_header_piece_re = re.compile(r';\s*([^\s;=]+|%s)\s*'
                                      r'(?:=\s*([^;]+|%s))?\s*' %
     (_quoted_string_re, _quoted_string_re))
 
-LOG = logging.getLogger('nova.api.openstack.compute.map')
+LOG = logging.getLogger(__name__)
 
 
 def unquote_header_value(value):
diff --git a/nova/api/openstack/volume/__init__.py b/nova/api/openstack/volume/__init__.py
index 8dbae267b..b4f72d8d5 100644
--- a/nova/api/openstack/volume/__init__.py
+++ b/nova/api/openstack/volume/__init__.py
@@ -29,7 +29,7 @@ from nova.api.openstack.volume import versions
 from nova import log as logging
 
 
-LOG = logging.getLogger('nova.api.openstack.volume')
+LOG = logging.getLogger(__name__)
 
 
 class APIRouter(nova.api.openstack.APIRouter):
diff --git a/nova/api/openstack/volume/contrib/__init__.py b/nova/api/openstack/volume/contrib/__init__.py
index 01b585c69..1439f81ce 100644
--- a/nova/api/openstack/volume/contrib/__init__.py
+++ b/nova/api/openstack/volume/contrib/__init__.py
@@ -27,7 +27,7 @@ from nova.api.openstack import extensions
 
 
 FLAGS = flags.FLAGS
-LOG = logging.getLogger('nova.api.openstack.volume.contrib')
+LOG = logging.getLogger(__name__)
 
 
 def standard_extensions(ext_mgr):
diff --git a/nova/api/openstack/volume/extensions.py b/nova/api/openstack/volume/extensions.py
index f07420182..fa7fc1a77 100644
--- a/nova/api/openstack/volume/extensions.py
+++ b/nova/api/openstack/volume/extensions.py
@@ -20,7 +20,7 @@ from nova import flags
 from nova import log as logging
 
 
-LOG = logging.getLogger('nova.api.openstack.volume.extensions')
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 
 
diff --git a/nova/api/openstack/volume/snapshots.py b/nova/api/openstack/volume/snapshots.py
index 67cfca3ea..b6dc83170 100644
--- a/nova/api/openstack/volume/snapshots.py
+++ b/nova/api/openstack/volume/snapshots.py
@@ -27,7 +27,7 @@ from nova import log as logging
 from nova import volume
 
 
-LOG = logging.getLogger("nova.api.openstack.volume.snapshots")
+LOG = logging.getLogger(__name__)
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/api/openstack/volume/volumes.py b/nova/api/openstack/volume/volumes.py
index dd0b688c5..10d83a000 100644
--- a/nova/api/openstack/volume/volumes.py
+++ b/nova/api/openstack/volume/volumes.py
@@ -28,7 +28,7 @@ from nova import volume
 from nova.volume import volume_types
 
 
-LOG = logging.getLogger("nova.api.openstack.volume.volumes")
+LOG = logging.getLogger(__name__)
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index ecfdd1ac7..c86d86a5f 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -34,7 +34,7 @@ XMLNS_V11 = 'http://docs.openstack.org/compute/api/v1.1'
 
 XMLNS_ATOM = 'http://www.w3.org/2005/Atom'
 
-LOG = logging.getLogger('nova.api.openstack.wsgi')
+LOG = logging.getLogger(__name__)
 
 # The vendor content types should serialize identically to the non-vendor
 # content types. So to avoid littering the code with both options, we
diff --git a/nova/api/validator.py b/nova/api/validator.py
index e3179b2c5..e90918599 100644
--- a/nova/api/validator.py
+++ b/nova/api/validator.py
@@ -23,7 +23,7 @@ import socket
 
 from nova import exception
 
-LOG = logging.getLogger("nova.api.validator")
+LOG = logging.getLogger(__name__)
 
 
 def _get_path_validator_regex():