Convert getLogger(__file__) into getLogger('heat...')

Makes a mess of logs when not installed.

Change-Id: Iab6bd247b943f276bf8de64aed65619b38f99acb
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/heat/db/sqlalchemy/session.py b/heat/db/sqlalchemy/session.py
index 70988f6bf92e600adac329ac7d1c5be347bf2184..caa9fecaa5250b901c050b1a67b4bf6731246ade 100644 (file)
--- a/heat/db/sqlalchemy/session.py
+++ b/heat/db/sqlalchemy/session.py
@@ -22,7 +22,7 @@ from sqlalchemy.exc import DisconnectionError
 from heat.db import api as db_api
 from heat.openstack.common import cfg
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.db.sqlalchemy.session')
 _ENGINE = None
 _MAKER = None
 

diff --git a/heat/engine/checkeddict.py b/heat/engine/checkeddict.py
index ad154b1063e899c7bb7757f5179d1975685be7d7..ec9c6fe35b7f444c263b67a18e6c4c155aff66c3 100644 (file)
--- a/heat/engine/checkeddict.py
+++ b/heat/engine/checkeddict.py
@@ -17,7 +17,7 @@ import collections
 import re
 import logging
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.engine.checkeddict')
 
 
 class CheckedDict(collections.MutableMapping):

diff --git a/heat/engine/eip.py b/heat/engine/eip.py
index dd7f21d5188a34bca790c7f2d8db690f907b8f33..ed5f47ad29eefa1830717dd3ecaa712f2cf91c89 100644 (file)
--- a/heat/engine/eip.py
+++ b/heat/engine/eip.py
@@ -18,7 +18,7 @@ import logging
 from heat.common import exception
 from heat.engine.resources import Resource
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.engine.eip')
 
 
 class ElasticIp(Resource):

diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index 0041bd8ccc1714b4f5da2dfa34b102ea39092d48..5e721ffea910505f0b1d801ad3ad3222da254609 100644 (file)
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -22,7 +22,7 @@ from heat.engine import checkeddict
 from heat.engine.resources import Resource
 from heat.db import api as db_api
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.engine.parser')
 
 
 class Stack(object):

diff --git a/heat/engine/resources.py b/heat/engine/resources.py
index cac26d45f8769c0d7fefd395903ee959e047bd8c..2a2d12f6d90385fe7f659582ee9aecd3eff0988e 100644 (file)
--- a/heat/engine/resources.py
+++ b/heat/engine/resources.py
@@ -26,7 +26,7 @@ from heat.common.config import HeatEngineConfigOpts
 from heat.db import api as db_api
 from heat.engine import checkeddict
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.engine.resources')
 
 
 class Resource(object):

diff --git a/heat/engine/security_group.py b/heat/engine/security_group.py
index 87f1edf9086819e12bf2a310ea863da523441184..7939bb920e921343c46b17cdc3c473305197fc65 100644 (file)
--- a/heat/engine/security_group.py
+++ b/heat/engine/security_group.py
@@ -19,7 +19,7 @@ from novaclient.exceptions import NotFound
 from heat.common import exception
 from heat.engine.resources import Resource
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.engine.security_group')
 
 
 class SecurityGroup(Resource):

diff --git a/heat/engine/user.py b/heat/engine/user.py
index c77205b5240d62a0236b9be5b6d05ec44300475d..58e64a80a593fed8177d387edb057de7d16bc35f 100644 (file)
--- a/heat/engine/user.py
+++ b/heat/engine/user.py
@@ -18,7 +18,7 @@ from novaclient.exceptions import BadRequest
 from heat.common import exception
 from heat.engine.resources import Resource
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.engine.user')
 
 
 class User(Resource):

diff --git a/heat/engine/volume.py b/heat/engine/volume.py
index c6be165d80d672758f3fc39a155aa63713109a09..7c61892c0fdab102c64f7942614e21d0775e096f 100644 (file)
--- a/heat/engine/volume.py
+++ b/heat/engine/volume.py
@@ -20,7 +20,7 @@ import re
 from heat.common import exception
 from heat.engine.resources import Resource
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.engine.volume')
 
 
 class Volume(Resource):