Don't use pecan to configure logging

Fixes bug #1184941 openstack.common.log gives a mechanism to configure logging and, by default, we will set up a handler on root logger. Using pecan to also configure a handler on the 'ironic' logger means every log message gets logged to console twice. It seems that the pecan logging configuration stuff is redundant with our existing logging configuration infrastructure. Change-Id: Iec0630b0e842e3b6a90021bf552d9b857c5a0552 (cherry picked from commit e6a083f)
openstack · May 31, 2013 · ff94b0e · ff94b0e
1 parent cd9a30e
commit ff94b0e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 48 deletions.
diff --git a/ceilometer/api/app.py b/ceilometer/api/app.py
@@ -61,8 +61,7 @@ def setup_app(pecan_config=None, extra_hooks=None):
         pecan_config.app.root,
         static_root=pecan_config.app.static_root,
         template_path=pecan_config.app.template_path,
-        logging=getattr(pecan_config, 'logging', {}),
-        debug=getattr(pecan_config.app, 'debug', False),
+        debug=CONF.debug,
         force_canonical=getattr(pecan_config.app, 'force_canonical', True),
         hooks=app_hooks,
         wrap_app=middleware.ParsableErrorMiddleware,
@@ -77,7 +76,6 @@ def setup_app(pecan_config=None, extra_hooks=None):
 class VersionSelectorApplication(object):
     def __init__(self):
         pc = get_pecan_config()
-        pc.app.debug = CONF.debug
         pc.app.enable_acl = (CONF.auth_strategy == 'keystone')
         self.v1 = v1app.make_app(cfg.CONF, enable_acl=pc.app.enable_acl)
         self.v2 = setup_app(pecan_config=pc)

diff --git a/ceilometer/api/config.py b/ceilometer/api/config.py
@@ -14,27 +14,6 @@
     'enable_acl': True,
 }
 
-logging = {
-    'loggers': {
-        'root': {'level': 'INFO', 'handlers': ['console']},
-        'ceilometer': {'level': 'DEBUG', 'handlers': ['console']},
-        'wsme': {'level': 'DEBUG', 'handlers': ['console']}
-    },
-    'handlers': {
-        'console': {
-            'level': 'DEBUG',
-            'class': 'logging.StreamHandler',
-            'formatter': 'simple'
-        }
-    },
-    'formatters': {
-        'simple': {
-            'format': ('%(asctime)s %(levelname)-5.5s [%(name)s]'
-                       '[%(threadName)s] %(message)s')
-        }
-    },
-}
-
 # Custom Configurations must be in Python dictionary format::
 #
 # foo = {'bar':'baz'}

diff --git a/ceilometer/tests/api.py b/ceilometer/tests/api.py
@@ -93,37 +93,13 @@ def _make_app(self, enable_acl=False):
                                    )
 
         self.config = {
-
             'app': {
                 'root': 'ceilometer.api.controllers.root.RootController',
                 'modules': ['ceilometer.api'],
                 'static_root': '%s/public' % root_dir,
                 'template_path': '%s/ceilometer/api/templates' % root_dir,
                 'enable_acl': enable_acl,
             },
-
-            'logging': {
-                'loggers': {
-                    'root': {'level': 'INFO', 'handlers': ['console']},
-                    'wsme': {'level': 'INFO', 'handlers': ['console']},
-                    'ceilometer': {'level': 'DEBUG',
-                                   'handlers': ['console'],
-                                   },
-                },
-                'handlers': {
-                    'console': {
-                        'level': 'DEBUG',
-                        'class': 'logging.StreamHandler',
-                        'formatter': 'simple'
-                    }
-                },
-                'formatters': {
-                    'simple': {
-                        'format': ('%(asctime)s %(levelname)-5.5s [%(name)s]'
-                                   '[%(threadName)s] %(message)s')
-                    }
-                },
-            },
         }
 
         return pecan.testing.load_test_app(self.config)