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/token/backends/kvs.py | 2 +- keystone/token/backends/memcache.py | 2 +- keystone/token/controllers.py | 2 +- keystone/token/core.py | 2 +- keystone/token/provider.py | 2 +- keystone/token/providers/pki.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'keystone/token') diff --git a/keystone/token/backends/kvs.py b/keystone/token/backends/kvs.py index c3c3e769..171d77df 100644 --- a/keystone/token/backends/kvs.py +++ b/keystone/token/backends/kvs.py @@ -17,8 +17,8 @@ import copy from keystone.common import kvs -from keystone.common import logging from keystone import exception +from keystone.openstack.common import log as logging from keystone.openstack.common import timeutils from keystone import token diff --git a/keystone/token/backends/memcache.py b/keystone/token/backends/memcache.py index 06e89d60..a07a516b 100644 --- a/keystone/token/backends/memcache.py +++ b/keystone/token/backends/memcache.py @@ -19,11 +19,11 @@ import copy import memcache -from keystone.common import logging from keystone.common import utils from keystone import config from keystone import exception from keystone.openstack.common import jsonutils +from keystone.openstack.common import log as logging from keystone.openstack.common import timeutils from keystone import token diff --git a/keystone/token/controllers.py b/keystone/token/controllers.py index 91514493..954ff8e8 100644 --- a/keystone/token/controllers.py +++ b/keystone/token/controllers.py @@ -3,10 +3,10 @@ import json from keystone.common import cms from keystone.common import controller from keystone.common import dependency -from keystone.common import logging from keystone.common import wsgi from keystone import config from keystone import exception +from keystone.openstack.common import log as logging from keystone.openstack.common import timeutils from keystone.token import core from keystone.token import provider as token_provider diff --git a/keystone/token/core.py b/keystone/token/core.py index bc27b80d..3959586b 100644 --- a/keystone/token/core.py +++ b/keystone/token/core.py @@ -21,10 +21,10 @@ import datetime from keystone.common import cms from keystone.common import dependency -from keystone.common import logging from keystone.common import manager from keystone import config from keystone import exception +from keystone.openstack.common import log as logging from keystone.openstack.common import timeutils diff --git a/keystone/token/provider.py b/keystone/token/provider.py index 2864be6f..f2acb0e1 100644 --- a/keystone/token/provider.py +++ b/keystone/token/provider.py @@ -18,10 +18,10 @@ from keystone.common import dependency -from keystone.common import logging from keystone.common import manager from keystone import config from keystone import exception +from keystone.openstack.common import log as logging CONF = config.CONF diff --git a/keystone/token/providers/pki.py b/keystone/token/providers/pki.py index 81abe5d4..64dde473 100644 --- a/keystone/token/providers/pki.py +++ b/keystone/token/providers/pki.py @@ -20,9 +20,9 @@ import json from keystone.common import cms from keystone.common import environment -from keystone.common import logging from keystone import config from keystone import exception +from keystone.openstack.common import log as logging from keystone.token.providers import uuid -- cgit