diff options
| author | Lance Bragstad <ldbragst@us.ibm.com> | 2013-08-12 17:41:40 +0000 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2013-08-15 12:28:57 -0500 |
| commit | 0c2fc69ba15d8a0a0c045294495503e451501ac9 (patch) | |
| tree | 0fe61f996796196687840619a5d7b0db37ef810a /keystone/middleware | |
| parent | 14e090154c10001550127628c2728013f15d4256 (diff) | |
| download | keystone-0c2fc69ba15d8a0a0c045294495503e451501ac9.tar.gz keystone-0c2fc69ba15d8a0a0c045294495503e451501ac9.tar.xz keystone-0c2fc69ba15d8a0a0c045294495503e451501ac9.zip | |
Refactor Keystone to use unified logging from Oslo
Modifications to use log from /keystone/openstack/common/log.py instead
of /keystone/common/logging.py. This change also includes some
refactoring to remove the WriteableLogger class from common/wsgi.py
since that is already included in the unified logging sync from Oslo.
This also moves fail_gracefully from /keystone/common/logging.py to
service.py as it is only used within that module.
blueprint unified-logging-in-keystone
Change-Id: I24b319bd6cfe5e345ea903196188f2394f4ef102
Diffstat (limited to 'keystone/middleware')
| -rw-r--r-- | keystone/middleware/core.py | 3 | ||||
| -rw-r--r-- | keystone/middleware/s3_token.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/keystone/middleware/core.py b/keystone/middleware/core.py index 863ef948..92b179c3 100644 --- a/keystone/middleware/core.py +++ b/keystone/middleware/core.py @@ -17,13 +17,12 @@ import webob.dec from keystone.common import config -from keystone.common import logging from keystone.common import serializer from keystone.common import utils from keystone.common import wsgi from keystone import exception from keystone.openstack.common import jsonutils - +from keystone.openstack.common import log as logging CONF = config.CONF LOG = logging.getLogger(__name__) diff --git a/keystone/middleware/s3_token.py b/keystone/middleware/s3_token.py index b346893b..39678591 100644 --- a/keystone/middleware/s3_token.py +++ b/keystone/middleware/s3_token.py @@ -37,8 +37,8 @@ import httplib import urllib import webob -from keystone.common import logging from keystone.openstack.common import jsonutils +from keystone.openstack.common import log as logging PROTOCOL_NAME = 'S3 Token Authentication' |