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/tests | |
| 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/tests')
| -rw-r--r-- | keystone/tests/core.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/keystone/tests/core.py b/keystone/tests/core.py index 21dc61dc..8d075335 100644 --- a/keystone/tests/core.py +++ b/keystone/tests/core.py @@ -40,7 +40,6 @@ from keystone import assignment from keystone import catalog from keystone.common import dependency from keystone.common import kvs -from keystone.common import logging from keystone.common import sql from keystone.common import utils from keystone.common import wsgi @@ -49,6 +48,7 @@ from keystone.contrib import ec2 from keystone import credential from keystone import exception from keystone import identity +from keystone.openstack.common import log as logging from keystone.openstack.common import timeutils from keystone import policy from keystone import token @@ -68,9 +68,6 @@ CONF = config.CONF cd = os.chdir -logging.getLogger('routes.middleware').level = logging.WARN - - def rootdir(*p): return os.path.join(ROOTDIR, *p) |