summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Gandelman <adamg@canonical.com>2012-02-16 17:20:14 -0800
committerAdam Gandelman <adamg@canonical.com>2012-02-16 17:21:20 -0800
commit546f952f91fab90fbb705c07d117285687bdbc5c (patch)
treed994dc849db0d50d44482b1dbe25f0660f934cc4
parent1a40142bc9d2bcec315836e40a9d65cfd877eff0 (diff)
Fix logging.config import
import logging.config, assign it to an attribute where keystone-all expects it. Fixes bug #933234 Change-Id: I0004900f5b68b86cd97d1bfe4036599ea2af1d69
-rw-r--r--keystone/common/logging.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/keystone/common/logging.py b/keystone/common/logging.py
index a9aaccfc..0d3f4693 100644
--- a/keystone/common/logging.py
+++ b/keystone/common/logging.py
@@ -6,6 +6,7 @@ from __future__ import absolute_import
import functools
import logging
+import logging.config
import pprint
from logging.handlers import SysLogHandler
@@ -36,6 +37,7 @@ log = logging.log
# classes
root = logging.root
+config = logging.config
Formatter = logging.Formatter
# handlers