From 0c2fc69ba15d8a0a0c045294495503e451501ac9 Mon Sep 17 00:00:00 2001 From: Lance Bragstad Date: Mon, 12 Aug 2013 17:41:40 +0000 Subject: 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 --- keystone/middleware/core.py | 3 +-- keystone/middleware/s3_token.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'keystone/middleware') 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' -- cgit