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/contrib | |
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/contrib')
-rw-r--r-- | keystone/contrib/access/core.py | 2 | ||||
-rw-r--r-- | keystone/contrib/stats/core.py | 2 | ||||
-rw-r--r-- | keystone/contrib/user_crud/core.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/keystone/contrib/access/core.py b/keystone/contrib/access/core.py index f0221200..059b7f93 100644 --- a/keystone/contrib/access/core.py +++ b/keystone/contrib/access/core.py @@ -17,9 +17,9 @@ import webob import webob.dec -from keystone.common import logging from keystone.common import wsgi from keystone import config +from keystone.openstack.common import log as logging from keystone.openstack.common import timeutils diff --git a/keystone/contrib/stats/core.py b/keystone/contrib/stats/core.py index 1d7b2cdf..9e6538db 100644 --- a/keystone/contrib/stats/core.py +++ b/keystone/contrib/stats/core.py @@ -15,12 +15,12 @@ # under the License. from keystone.common import extension -from keystone.common import logging from keystone.common import manager from keystone.common import wsgi from keystone import config from keystone import exception from keystone import identity +from keystone.openstack.common import log as logging from keystone import policy from keystone import token diff --git a/keystone/contrib/user_crud/core.py b/keystone/contrib/user_crud/core.py index f9f09b89..2129af40 100644 --- a/keystone/contrib/user_crud/core.py +++ b/keystone/contrib/user_crud/core.py @@ -18,10 +18,10 @@ import copy import uuid from keystone.common import extension -from keystone.common import logging from keystone.common import wsgi from keystone import exception from keystone import identity +from keystone.openstack.common import log as logging LOG = logging.getLogger(__name__) @@ -82,7 +82,7 @@ class UserController(identity.controllers.User): new_token_ref = copy.copy(token_ref) new_token_ref['id'] = token_id self.token_api.create_token(token_id, new_token_ref) - logging.debug('TOKEN_REF %s', new_token_ref) + LOG.debug('TOKEN_REF %s', new_token_ref) return {'access': {'token': new_token_ref}} |