Use module names as logger names

Automatically use the current module's __name__ attribute as the name for
its logger, instead of hardcoding it or (worse) using __path__.

Change-Id: Ic089e0829e5fb93c3debd21e7715ee4c95f84d4c
Signed-off-by: Zane Bitter <zbitter@redhat.com>

heat/api/cfn/v1/stacks.py

@@ -35,7 +35,7 @@ import heat.openstack.common.rpc.common as rpc_common
 from heat.openstack.common import log as logging
 from heat.openstack.common.gettextutils import _
 
-logger = logging.getLogger('heat.api.cfn.v1.stacks')
+logger = logging.getLogger(__name__)
 
 
 class StackController(object):

heat/api/cloudwatch/watch.py

@@ -25,7 +25,7 @@ from heat.rpc import api as engine_api
 import heat.openstack.common.rpc.common as rpc_common
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger('heat.api.cloudwatch.controller')
+logger = logging.getLogger(__name__)
 
 
 class WatchController(object):

heat/api/middleware/version_negotiation.py

@@ -25,7 +25,7 @@ from heat.openstack.common import log as logging
 
 from heat.common import wsgi
 
-logger = logging.getLogger('heat.api.middleware.version_negotiation')
+logger = logging.getLogger(__name__)
 
 
 class VersionNegotiationFilter(wsgi.Middleware):

heat/api/openstack/v1/stacks.py

@@ -33,7 +33,7 @@ from heat.rpc import client as rpc_client
 import heat.openstack.common.rpc.common as rpc_common
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger('heat.api.openstack.v1.stacks')
+logger = logging.getLogger(__name__)
 
 
 class InstantiationData(object):

heat/db/sqlalchemy/session.py

@@ -23,7 +23,7 @@ from heat.openstack.common import log as logging
 
 from heat.db import api as db_api
 
-logger = logging.getLogger('heat.db.sqlalchemy.session')
+logger = logging.getLogger(__name__)
 _ENGINE = None
 _MAKER = None
 

heat/engine/api.py

@@ -20,7 +20,7 @@ from heat.engine import watchrule
 
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger('heat.engine.manager')
+logger = logging.getLogger(__name__)
 
 
 def extract_args(params):

heat/engine/clients.py

@@ -35,7 +35,7 @@ from heat.common import heat_keystoneclient as kc
 from heat.openstack.common import cfg
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger('heat.engine.clients')
+logger = logging.getLogger(__name__)
 
 
 class Clients(object):

heat/engine/parser.py

@@ -29,7 +29,7 @@ from heat.db import api as db_api
 
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger('heat.engine.parser')
+logger = logging.getLogger(__name__)
 
 (PARAM_STACK_NAME, PARAM_REGION) = ('AWS::StackName', 'AWS::Region')
 

heat/engine/resources/autoscaling.py

@@ -18,7 +18,7 @@ from heat.engine.resources import instance
 
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger('heat.engine.autoscaling')
+logger = logging.getLogger(__name__)
 
 
 class AutoScalingGroup(resource.Resource):

heat/engine/resources/cloud_watch.py

@@ -20,7 +20,7 @@ from heat.db import api as db_api
 
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger('heat.engine.cloud_watch')
+logger = logging.getLogger(__name__)
 
 
 class CloudWatchAlarm(resource.Resource):

heat/engine/resources/dbinstance.py

@@ -18,7 +18,7 @@ from heat.engine.resources import stack
 from heat.common import template_format
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger(__name__)
 
 mysql_template = r'''
 {

heat/engine/resources/eip.py

@@ -19,7 +19,7 @@ from novaclient.exceptions import NotFound
 
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger('heat.engine.eip')
+logger = logging.getLogger(__name__)
 
 
 class ElasticIp(resource.Resource):

heat/engine/resources/instance.py

@@ -29,7 +29,7 @@ from heat.openstack.common import cfg
 
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger('heat.engine.instance')
+logger = logging.getLogger(__name__)
 
 
 class Restarter(resource.Resource):

heat/engine/resources/loadbalancer.py

@@ -20,7 +20,7 @@ from novaclient.exceptions import NotFound
 
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger(__name__)
 
 lb_template = '''
 {

heat/engine/resources/quantum/floatingip.py

@@ -16,7 +16,7 @@
 from heat.openstack.common import log as logging
 from heat.engine.resources.quantum import quantum
 
-logger = logging.getLogger('heat.engine.quantum')
+logger = logging.getLogger(__name__)
 
 
 class FloatingIP(quantum.QuantumResource):

heat/engine/resources/quantum/net.py

@@ -16,7 +16,7 @@
 from heat.openstack.common import log as logging
 from heat.engine.resources.quantum import quantum
 
-logger = logging.getLogger('heat.engine.quantum')
+logger = logging.getLogger(__name__)
 
 
 class Net(quantum.QuantumResource):

heat/engine/resources/quantum/port.py

@@ -16,7 +16,7 @@
 from heat.openstack.common import log as logging
 from heat.engine.resources.quantum import quantum
 
-logger = logging.getLogger('heat.engine.quantum')
+logger = logging.getLogger(__name__)
 
 
 class Port(quantum.QuantumResource):

heat/engine/resources/quantum/quantum.py

@@ -18,7 +18,7 @@ from heat.engine import resource
 
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger('heat.engine.quantum')
+logger = logging.getLogger(__name__)
 
 
 class QuantumResource(resource.Resource):

heat/engine/resources/quantum/router.py

@@ -17,7 +17,7 @@ from heat.engine.resources.quantum import quantum
 
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger('heat.engine.quantum')
+logger = logging.getLogger(__name__)
 
 
 class Router(quantum.QuantumResource):

heat/engine/resources/quantum/subnet.py

@@ -18,7 +18,7 @@ from heat.common import exception
 from heat.openstack.common import log as logging
 from heat.engine.resources.quantum import quantum
 
-logger = logging.getLogger('heat.engine.quantum')
+logger = logging.getLogger(__name__)
 
 
 class Subnet(quantum.QuantumResource):

heat/engine/resources/s3.py

@@ -26,7 +26,7 @@ try:
 except ImportError:
     swiftclient_present = False
 
-logger = logging.getLogger('heat.engine.s3')
+logger = logging.getLogger(__name__)
 
 
 class S3Bucket(resource.Resource):

heat/engine/resources/security_group.py

@@ -19,7 +19,7 @@ from heat.engine import resource
 
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger('heat.engine.security_group')
+logger = logging.getLogger(__name__)
 
 
 class SecurityGroup(resource.Resource):

heat/engine/resources/stack.py

@@ -23,7 +23,7 @@ from heat.engine import parser
 
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger(__name__)
 
 
 (PROP_TEMPLATE_URL,

heat/engine/resources/user.py

@@ -19,7 +19,7 @@ from heat.engine import resource
 
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger('heat.engine.user')
+logger = logging.getLogger(__name__)
 
 #
 # We are ignoring Policies and Groups as keystone does not support them.

heat/engine/resources/volume.py

@@ -20,7 +20,7 @@ from heat.common import exception
 from heat.engine import resource
 from novaclient.exceptions import NotFound
 
-logger = logging.getLogger('heat.engine.volume')
+logger = logging.getLogger(__name__)
 
 
 class Volume(resource.Resource):

heat/engine/resources/wait_condition.py

@@ -35,7 +35,7 @@ try:
 except ImportError:
     from heat.common.ec2signer import Ec2Signer
 
-logger = logging.getLogger('heat.engine.wait_condition')
+logger = logging.getLogger(__name__)
 
 
 class WaitConditionHandle(resource.Resource):

heat/engine/watchrule.py

@@ -24,7 +24,7 @@ from heat.rpc import api as rpc_api
 from heat.common import context as ctxtlib
 import eventlet
 
-logger = logging.getLogger('heat.engine.watchrule')
+logger = logging.getLogger(__name__)
 greenpool = eventlet.GreenPool()
 
 

heat/tests/test_waitcondition.py

@@ -14,7 +14,6 @@
 
 
 import json
-import logging
 import mox
 import sys
 import uuid
@@ -33,8 +32,6 @@ from heat.engine.resources import wait_condition as wc
 from heat.common import context
 from heat.openstack.common import cfg
 
-logger = logging.getLogger('test_waitcondition')
-
 test_template_waitcondition = '''
 {
   "AWSTemplateFormatVersion" : "2010-09-09",