summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-05-11 21:23:33 +0000
committerGerrit Code Review <review@openstack.org>2012-05-11 21:23:33 +0000
commitb7e9b4b60470c3cda4c2222e84e399065b07b3b8 (patch)
treecd5c76c6ad7760b4876829870bf4212f1a82cf23
parent8c2e0737ff96fd38fe4a3c5527392345bd35e318 (diff)
parentf6088545d2569423f4911bcddccc3a7eac36baf2 (diff)
Merge "Setup logging, particularly for keystone middleware"
-rw-r--r--Authors1
-rw-r--r--nova/log.py3
2 files changed, 4 insertions, 0 deletions
diff --git a/Authors b/Authors
index 3818e4f57..0f9db987d 100644
--- a/Authors
+++ b/Authors
@@ -3,6 +3,7 @@ Adam Gandelman <adamg@canonical.com>
Adam Johnson <adjohn@gmail.com>
Adrian Smith <adrian_f_smith@dell.com>
Ahmad Hassan <ahmad.hassan@hp.com>
+Alessio Ababilov <aababilov@griddynamics.com>
Alex Meade <alex.meade@rackspace.com>
Alexander Sakhnov <asakhnov@mirantis.com>
Alexander Kovalev <akovalev@mirantis.com>
diff --git a/nova/log.py b/nova/log.py
index 268f12f33..7970802f3 100644
--- a/nova/log.py
+++ b/nova/log.py
@@ -71,6 +71,7 @@ log_opts = [
'sqlalchemy=WARN',
'boto=WARN',
'suds=INFO',
+ 'keystone=INFO',
'eventlet.wsgi.server=WARN'
],
help='list of logger=LEVEL pairs'),
@@ -384,6 +385,8 @@ def _setup_logging_from_flags():
level = logging.getLevelName(level_name)
logger = logging.getLogger(mod)
logger.setLevel(level)
+ for handler in nova_root.handlers:
+ logger.addHandler(handler)
# NOTE(jkoelker) Clear the handlers for the root logger that was setup
# by basicConfig in nova/__init__.py and install the