diff --git a/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py index 65476e1db5..6c61663325 100644 --- a/heat/api/cfn/v1/stacks.py +++ b/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): diff --git a/heat/api/cloudwatch/watch.py b/heat/api/cloudwatch/watch.py index 0020ec1942..26de46b862 100644 --- a/heat/api/cloudwatch/watch.py +++ b/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): diff --git a/heat/api/middleware/version_negotiation.py b/heat/api/middleware/version_negotiation.py index 2e3de02985..de82a00b8e 100644 --- a/heat/api/middleware/version_negotiation.py +++ b/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): diff --git a/heat/api/openstack/v1/stacks.py b/heat/api/openstack/v1/stacks.py index 2c058e15e0..3fef4aa78c 100644 --- a/heat/api/openstack/v1/stacks.py +++ b/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): diff --git a/heat/db/sqlalchemy/session.py b/heat/db/sqlalchemy/session.py index 90fb436146..b262316386 100644 --- a/heat/db/sqlalchemy/session.py +++ b/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 diff --git a/heat/engine/api.py b/heat/engine/api.py index 9403f4c7b4..6cfea0a88e 100644 --- a/heat/engine/api.py +++ b/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): diff --git a/heat/engine/clients.py b/heat/engine/clients.py index 9270c2f5bb..05ff53638b 100644 --- a/heat/engine/clients.py +++ b/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): diff --git a/heat/engine/parser.py b/heat/engine/parser.py index 10d1dc93fd..8abb9cc953 100644 --- a/heat/engine/parser.py +++ b/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') diff --git a/heat/engine/resources/autoscaling.py b/heat/engine/resources/autoscaling.py index 3ca2844f6e..eec9db20f5 100644 --- a/heat/engine/resources/autoscaling.py +++ b/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): diff --git a/heat/engine/resources/cloud_watch.py b/heat/engine/resources/cloud_watch.py index 45b723f7c6..492a9e715c 100644 --- a/heat/engine/resources/cloud_watch.py +++ b/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): diff --git a/heat/engine/resources/dbinstance.py b/heat/engine/resources/dbinstance.py index bb5c2b2277..e2c1ea3331 100644 --- a/heat/engine/resources/dbinstance.py +++ b/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''' { diff --git a/heat/engine/resources/eip.py b/heat/engine/resources/eip.py index c0b6dbf823..dab1bbc170 100644 --- a/heat/engine/resources/eip.py +++ b/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): diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py index 5d31fc6a83..b70da3115c 100644 --- a/heat/engine/resources/instance.py +++ b/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): diff --git a/heat/engine/resources/loadbalancer.py b/heat/engine/resources/loadbalancer.py index 9dd8c145c4..4ebe535d59 100644 --- a/heat/engine/resources/loadbalancer.py +++ b/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 = ''' { diff --git a/heat/engine/resources/quantum/floatingip.py b/heat/engine/resources/quantum/floatingip.py index 8739492a2e..b17e3628c2 100644 --- a/heat/engine/resources/quantum/floatingip.py +++ b/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): diff --git a/heat/engine/resources/quantum/net.py b/heat/engine/resources/quantum/net.py index ba88945b01..645c2a03b7 100644 --- a/heat/engine/resources/quantum/net.py +++ b/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): diff --git a/heat/engine/resources/quantum/port.py b/heat/engine/resources/quantum/port.py index 36fa9bece0..04af57380a 100644 --- a/heat/engine/resources/quantum/port.py +++ b/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): diff --git a/heat/engine/resources/quantum/quantum.py b/heat/engine/resources/quantum/quantum.py index defc3ec412..40dfe2adf2 100644 --- a/heat/engine/resources/quantum/quantum.py +++ b/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): diff --git a/heat/engine/resources/quantum/router.py b/heat/engine/resources/quantum/router.py index 6b33a3bfe7..19fffbcef5 100644 --- a/heat/engine/resources/quantum/router.py +++ b/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): diff --git a/heat/engine/resources/quantum/subnet.py b/heat/engine/resources/quantum/subnet.py index 9680f51cdd..81014934bf 100644 --- a/heat/engine/resources/quantum/subnet.py +++ b/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): diff --git a/heat/engine/resources/s3.py b/heat/engine/resources/s3.py index f066825ba5..b0c897613f 100644 --- a/heat/engine/resources/s3.py +++ b/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): diff --git a/heat/engine/resources/security_group.py b/heat/engine/resources/security_group.py index f94006da1f..d648fa7c1c 100644 --- a/heat/engine/resources/security_group.py +++ b/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): diff --git a/heat/engine/resources/stack.py b/heat/engine/resources/stack.py index cb1e4c26e2..02c130f990 100644 --- a/heat/engine/resources/stack.py +++ b/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, diff --git a/heat/engine/resources/user.py b/heat/engine/resources/user.py index fce50008ce..e3782c72b7 100644 --- a/heat/engine/resources/user.py +++ b/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. diff --git a/heat/engine/resources/volume.py b/heat/engine/resources/volume.py index 204d43ad15..aace548600 100644 --- a/heat/engine/resources/volume.py +++ b/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): diff --git a/heat/engine/resources/wait_condition.py b/heat/engine/resources/wait_condition.py index c57662746e..aa42f6f526 100644 --- a/heat/engine/resources/wait_condition.py +++ b/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): diff --git a/heat/engine/watchrule.py b/heat/engine/watchrule.py index 58ff391a10..59176458c5 100644 --- a/heat/engine/watchrule.py +++ b/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() diff --git a/heat/tests/test_waitcondition.py b/heat/tests/test_waitcondition.py index 4f5bf5b931..6179804eef 100644 --- a/heat/tests/test_waitcondition.py +++ b/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",