diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-08-15 21:42:32 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-08-15 21:42:32 +0000 |
commit | 049c5c7159ba88f584c832e6b1a87d6bee9c31d7 (patch) | |
tree | 95c761876ebd90b6466ec338246e2fa4cc5ecf1f /keystone/common/wsgi.py | |
parent | 1b4f0a5ec848af94e322a8f55deb52223c94b62a (diff) | |
parent | 0c2fc69ba15d8a0a0c045294495503e451501ac9 (diff) | |
download | keystone-049c5c7159ba88f584c832e6b1a87d6bee9c31d7.tar.gz keystone-049c5c7159ba88f584c832e6b1a87d6bee9c31d7.tar.xz keystone-049c5c7159ba88f584c832e6b1a87d6bee9c31d7.zip |
Merge "Refactor Keystone to use unified logging from Oslo"
Diffstat (limited to 'keystone/common/wsgi.py')
-rw-r--r-- | keystone/common/wsgi.py | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py index f47cde13..d515fde6 100644 --- a/keystone/common/wsgi.py +++ b/keystone/common/wsgi.py @@ -27,11 +27,11 @@ import webob.dec import webob.exc from keystone.common import config -from keystone.common import logging from keystone.common import utils from keystone import exception from keystone.openstack.common import importutils from keystone.openstack.common import jsonutils +from keystone.openstack.common import log as logging CONF = config.CONF @@ -122,17 +122,6 @@ def validate_token_bind(context, token_ref): raise exception.Unauthorized() -class WritableLogger(object): - """A thin wrapper that responds to `write` and logs.""" - - def __init__(self, logger, level=logging.DEBUG): - self.logger = logger - self.level = level - - def write(self, msg): - self.logger.log(self.level, msg) - - class Request(webob.Request): pass @@ -394,7 +383,7 @@ class Debug(Middleware): @webob.dec.wsgify(RequestClass=Request) def __call__(self, req): - if LOG.isEnabledFor(logging.DEBUG): + if LOG.isEnabledFor(LOG.debug): LOG.debug('%s %s %s', ('*' * 20), 'REQUEST ENVIRON', ('*' * 20)) for key, value in req.environ.items(): LOG.debug('%s = %s', key, mask_password(value, @@ -406,7 +395,7 @@ class Debug(Middleware): LOG.debug('') resp = req.get_response(self.application) - if LOG.isEnabledFor(logging.DEBUG): + if LOG.isEnabledFor(LOG.debug): LOG.debug('%s %s %s', ('*' * 20), 'RESPONSE HEADERS', ('*' * 20)) for (key, value) in resp.headers.iteritems(): LOG.debug('%s = %s', key, value) @@ -455,7 +444,7 @@ class Router(object): # if we're only running in debug, bump routes' internal logging up a # notch, as it's very spammy if CONF.debug: - logging.getLogger('routes.middleware').setLevel(logging.INFO) + logging.getLogger('routes.middleware') self.map = mapper self._router = routes.middleware.RoutesMiddleware(self._dispatch, |