summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-05-27 19:42:57 +0100
committerMark McLoughlin <markmc@redhat.com>2013-05-28 11:34:43 +0100
commit46b9a88ba110e5489749327f6dd381a8af695c3e (patch)
tree25ab8cf4ca93f64e890c3abc0afa2f7aa57b1fdb
parent376310c83bd1ebde3677725a672ef45053ca90b4 (diff)
downloadironic-46b9a88ba110e5489749327f6dd381a8af695c3e.tar.gz
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
-rw-r--r--ironic/api/app.py4
-rw-r--r--ironic/api/config.py21
2 files changed, 1 insertions, 24 deletions
diff --git a/ironic/api/app.py b/ironic/api/app.py
index 8d9f1df50..b3e623715 100644
--- a/ironic/api/app.py
+++ b/ironic/api/app.py
@@ -58,8 +58,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,
)
@@ -73,7 +72,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 = setup_app(pecan_config=pc)
diff --git a/ironic/api/config.py b/ironic/api/config.py
index d9278fd7f..cf93dd1ac 100644
--- a/ironic/api/config.py
+++ b/ironic/api/config.py
@@ -14,27 +14,6 @@ app = {
'enable_acl': False,
}
-logging = {
- 'loggers': {
- 'root': {'level': 'INFO', 'handlers': ['console']},
- 'ironic': {'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'}