From 0f61b11141baff243d0e4c10b3dcb612584f7426 Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Tue, 3 Feb 2015 17:05:10 -0500 Subject: [PATCH] Use oslo.log instead of incubator Most of changes are just replacing from keystone.openstack.common import log with from oslo_log import log There are some other specific changes that had to be made * Initialize logger in keystone/config.py Change-Id: I859edb71c434051ffe7f34c16018b738ddb71e3b --- HACKING.rst | 2 +- config-generator/keystone.conf | 2 +- keystone/assignment/backends/ldap.py | 2 +- keystone/assignment/backends/sql.py | 2 +- keystone/assignment/controllers.py | 2 +- keystone/assignment/core.py | 2 +- keystone/assignment/role_backends/ldap.py | 3 ++- keystone/auth/controllers.py | 2 +- keystone/auth/plugins/mapped.py | 2 +- keystone/auth/plugins/oauth1.py | 2 +- keystone/auth/plugins/password.py | 2 +- keystone/auth/plugins/token.py | 2 +- keystone/catalog/backends/templated.py | 2 +- keystone/catalog/core.py | 2 +- keystone/cli.py | 5 ++--- keystone/common/authorization.py | 3 ++- keystone/common/cache/_memcache_pool.py | 2 +- keystone/common/cache/backends/mongo.py | 2 +- keystone/common/cache/core.py | 2 +- keystone/common/controller.py | 2 +- keystone/common/environment/__init__.py | 2 +- keystone/common/environment/eventlet_server.py | 5 +++-- keystone/common/kvs/backends/memcached.py | 2 +- keystone/common/kvs/core.py | 2 +- keystone/common/ldap/core.py | 2 +- keystone/common/openssl.py | 3 ++- keystone/common/sql/core.py | 2 +- .../common/sql/migrate_repo/versions/034_havana.py | 2 +- keystone/common/utils.py | 2 +- keystone/common/wsgi.py | 2 +- keystone/config.py | 14 +++++--------- keystone/contrib/endpoint_filter/core.py | 2 +- keystone/contrib/endpoint_policy/core.py | 2 +- keystone/contrib/example/core.py | 2 +- keystone/contrib/federation/core.py | 2 +- keystone/contrib/federation/idp.py | 2 +- keystone/contrib/federation/utils.py | 2 +- keystone/contrib/oauth1/validator.py | 2 +- keystone/contrib/revoke/core.py | 2 +- keystone/contrib/user_crud/core.py | 3 ++- keystone/controllers.py | 2 +- keystone/credential/core.py | 2 +- keystone/exception.py | 2 +- keystone/identity/backends/ldap.py | 2 +- keystone/identity/controllers.py | 3 ++- keystone/identity/core.py | 2 +- keystone/middleware/core.py | 2 +- keystone/notifications.py | 2 +- keystone/policy/backends/rules.py | 3 ++- keystone/resource/backends/ldap.py | 3 ++- keystone/resource/backends/sql.py | 3 ++- keystone/resource/controllers.py | 3 ++- keystone/resource/core.py | 2 +- keystone/service.py | 2 +- keystone/tests/unit/core.py | 3 ++- keystone/tests/unit/fakeldap.py | 2 +- keystone/tests/unit/test_core.py | 2 +- keystone/tests/unit/test_v3_federation.py | 2 +- keystone/tests/unit/utils.py | 2 +- keystone/token/controllers.py | 2 +- keystone/token/core.py | 3 ++- keystone/token/persistence/backends/kvs.py | 2 +- keystone/token/persistence/backends/sql.py | 2 +- keystone/token/persistence/core.py | 2 +- keystone/token/provider.py | 2 +- keystone/token/providers/common.py | 2 +- keystone/token/providers/pki.py | 2 +- keystone/token/providers/pkiz.py | 2 +- keystone/trust/backends/sql.py | 2 +- keystone/trust/controllers.py | 2 +- keystone/trust/core.py | 2 +- requirements-py3.txt | 1 + requirements.txt | 1 + setup.cfg | 1 - 74 files changed, 91 insertions(+), 83 deletions(-) diff --git a/HACKING.rst b/HACKING.rst index 6b4181121a..86bce2012e 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -25,7 +25,7 @@ Logging Use the common logging module, and ensure you ``getLogger``:: - from keystone.openstack.common import log + from oslo_log import log LOG = log.getLogger(__name__) diff --git a/config-generator/keystone.conf b/config-generator/keystone.conf index 21fab54f5a..433661e6fe 100644 --- a/config-generator/keystone.conf +++ b/config-generator/keystone.conf @@ -4,8 +4,8 @@ wrap_width = 79 namespace = keystone namespace = keystone.notifications namespace = keystone.openstack.common.eventlet_backdoor -namespace = keystone.openstack.common.log namespace = keystone.openstack.common.policy +namespace = oslo.log namespace = oslo.messaging namespace = oslo.db namespace = oslo.middleware diff --git a/keystone/assignment/backends/ldap.py b/keystone/assignment/backends/ldap.py index 98172dd8d1..1f986b81b2 100644 --- a/keystone/assignment/backends/ldap.py +++ b/keystone/assignment/backends/ldap.py @@ -15,6 +15,7 @@ from __future__ import absolute_import import ldap as ldap import ldap.filter +from oslo_log import log from keystone import assignment from keystone.assignment.role_backends import ldap as ldap_role @@ -24,7 +25,6 @@ from keystone import config from keystone import exception from keystone.i18n import _ from keystone.identity.backends import ldap as ldap_identity -from keystone.openstack.common import log from keystone.openstack.common import versionutils diff --git a/keystone/assignment/backends/sql.py b/keystone/assignment/backends/sql.py index b90472c4f3..a741ee75fc 100644 --- a/keystone/assignment/backends/sql.py +++ b/keystone/assignment/backends/sql.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log import six import sqlalchemy from sqlalchemy.sql.expression import false @@ -21,7 +22,6 @@ from keystone.common import sql from keystone import config from keystone import exception from keystone.i18n import _ -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/assignment/controllers.py b/keystone/assignment/controllers.py index 4d740fcb6c..1121bde5da 100644 --- a/keystone/assignment/controllers.py +++ b/keystone/assignment/controllers.py @@ -19,6 +19,7 @@ import copy import functools import uuid +from oslo_log import log from six.moves import urllib from keystone.assignment import schema @@ -29,7 +30,6 @@ from keystone import config from keystone import exception from keystone.i18n import _, _LW from keystone.models import token_model -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/assignment/core.py b/keystone/assignment/core.py index 65828bdcbd..9c3012c083 100644 --- a/keystone/assignment/core.py +++ b/keystone/assignment/core.py @@ -16,6 +16,7 @@ import abc +from oslo_log import log import six from keystone.common import cache @@ -27,7 +28,6 @@ from keystone import exception from keystone.i18n import _ from keystone.i18n import _LI from keystone import notifications -from keystone.openstack.common import log from keystone.openstack.common import versionutils diff --git a/keystone/assignment/role_backends/ldap.py b/keystone/assignment/role_backends/ldap.py index 674f47579d..7310376a74 100644 --- a/keystone/assignment/role_backends/ldap.py +++ b/keystone/assignment/role_backends/ldap.py @@ -12,6 +12,8 @@ from __future__ import absolute_import +from oslo_log import log + from keystone import assignment from keystone.common import ldap as common_ldap from keystone.common import models @@ -19,7 +21,6 @@ from keystone import config from keystone import exception from keystone.i18n import _ from keystone.identity.backends import ldap as ldap_identity -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/auth/controllers.py b/keystone/auth/controllers.py index 9ff471f666..56ec7d7721 100644 --- a/keystone/auth/controllers.py +++ b/keystone/auth/controllers.py @@ -15,6 +15,7 @@ import sys from keystoneclient.common import cms +from oslo_log import log from oslo_serialization import jsonutils from oslo_utils import importutils from oslo_utils import timeutils @@ -27,7 +28,6 @@ from keystone import config from keystone.contrib import federation from keystone import exception from keystone.i18n import _, _LI, _LW -from keystone.openstack.common import log from keystone.resource import controllers as resource_controllers diff --git a/keystone/auth/plugins/mapped.py b/keystone/auth/plugins/mapped.py index 902651d14c..98a2251de2 100644 --- a/keystone/auth/plugins/mapped.py +++ b/keystone/auth/plugins/mapped.py @@ -12,6 +12,7 @@ import functools +from oslo_log import log from oslo_serialization import jsonutils from pycadf import cadftaxonomy as taxonomy from six.moves.urllib import parse @@ -24,7 +25,6 @@ from keystone import exception from keystone.i18n import _ from keystone.models import token_model from keystone import notifications -from keystone.openstack.common import log LOG = log.getLogger(__name__) diff --git a/keystone/auth/plugins/oauth1.py b/keystone/auth/plugins/oauth1.py index 1846cb88e2..7a63bc2954 100644 --- a/keystone/auth/plugins/oauth1.py +++ b/keystone/auth/plugins/oauth1.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log from oslo_utils import timeutils from keystone import auth @@ -21,7 +22,6 @@ from keystone.contrib.oauth1 import core as oauth from keystone.contrib.oauth1 import validator from keystone import exception from keystone.i18n import _ -from keystone.openstack.common import log LOG = log.getLogger(__name__) diff --git a/keystone/auth/plugins/password.py b/keystone/auth/plugins/password.py index b1de7e3d9c..80726f50d7 100644 --- a/keystone/auth/plugins/password.py +++ b/keystone/auth/plugins/password.py @@ -14,13 +14,13 @@ import sys +from oslo_log import log import six from keystone import auth from keystone.common import dependency from keystone import exception from keystone.i18n import _ -from keystone.openstack.common import log METHOD_NAME = 'password' diff --git a/keystone/auth/plugins/token.py b/keystone/auth/plugins/token.py index 5154be2c29..990b6dc76b 100644 --- a/keystone/auth/plugins/token.py +++ b/keystone/auth/plugins/token.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log import six from keystone import auth @@ -22,7 +23,6 @@ from keystone import config from keystone import exception from keystone.i18n import _ from keystone.models import token_model -from keystone.openstack.common import log LOG = log.getLogger(__name__) diff --git a/keystone/catalog/backends/templated.py b/keystone/catalog/backends/templated.py index 68c1c0f868..0a4e482afb 100644 --- a/keystone/catalog/backends/templated.py +++ b/keystone/catalog/backends/templated.py @@ -14,6 +14,7 @@ import os.path +from oslo_log import log import six from keystone.catalog.backends import kvs @@ -21,7 +22,6 @@ from keystone.catalog import core from keystone import config from keystone import exception from keystone.i18n import _LC -from keystone.openstack.common import log LOG = log.getLogger(__name__) diff --git a/keystone/catalog/core.py b/keystone/catalog/core.py index 108d0f736f..6d97313842 100644 --- a/keystone/catalog/core.py +++ b/keystone/catalog/core.py @@ -17,6 +17,7 @@ import abc +from oslo_log import log import six from keystone.common import cache @@ -29,7 +30,6 @@ from keystone import exception from keystone.i18n import _ from keystone.i18n import _LE from keystone import notifications -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/cli.py b/keystone/cli.py index 66b826b0b5..981a5ef3d6 100644 --- a/keystone/cli.py +++ b/keystone/cli.py @@ -17,6 +17,7 @@ from __future__ import absolute_import import os from oslo_config import cfg +from oslo_log import log import pbr.version from keystone import assignment @@ -27,13 +28,11 @@ from keystone.common import utils from keystone import config from keystone.i18n import _, _LW from keystone import identity -from keystone.openstack.common import log from keystone import token -LOG = log.getLogger(__name__) - CONF = config.CONF +LOG = log.getLogger(__name__) class BaseApp(object): diff --git a/keystone/common/authorization.py b/keystone/common/authorization.py index e25640d8fe..5cb1e630c4 100644 --- a/keystone/common/authorization.py +++ b/keystone/common/authorization.py @@ -16,10 +16,11 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log + from keystone import exception from keystone.i18n import _, _LW from keystone.models import token_model -from keystone.openstack.common import log AUTH_CONTEXT_ENV = 'KEYSTONE_AUTH_CONTEXT' diff --git a/keystone/common/cache/_memcache_pool.py b/keystone/common/cache/_memcache_pool.py index da89752284..ca974c934f 100644 --- a/keystone/common/cache/_memcache_pool.py +++ b/keystone/common/cache/_memcache_pool.py @@ -26,11 +26,11 @@ import threading import time import memcache +from oslo_log import log from six.moves import queue from keystone import exception from keystone.i18n import _ -from keystone.openstack.common import log LOG = log.getLogger(__name__) diff --git a/keystone/common/cache/backends/mongo.py b/keystone/common/cache/backends/mongo.py index ca2eba4fb5..0d14864e24 100644 --- a/keystone/common/cache/backends/mongo.py +++ b/keystone/common/cache/backends/mongo.py @@ -17,13 +17,13 @@ import datetime from dogpile.cache import api from dogpile.cache import util as dp_util +from oslo_log import log from oslo_utils import importutils from oslo_utils import timeutils import six from keystone import exception from keystone.i18n import _, _LW -from keystone.openstack.common import log NO_VALUE = api.NO_VALUE diff --git a/keystone/common/cache/core.py b/keystone/common/cache/core.py index 34dd3a3d6d..0ea78567d3 100644 --- a/keystone/common/cache/core.py +++ b/keystone/common/cache/core.py @@ -17,12 +17,12 @@ import dogpile.cache from dogpile.cache import proxy from dogpile.cache import util +from oslo_log import log from oslo_utils import importutils from keystone import config from keystone import exception from keystone.i18n import _, _LE -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/common/controller.py b/keystone/common/controller.py index 60e69ab1c8..ca9980d138 100644 --- a/keystone/common/controller.py +++ b/keystone/common/controller.py @@ -15,6 +15,7 @@ import functools import uuid +from oslo_log import log import six from keystone.common import authorization @@ -26,7 +27,6 @@ from keystone import config from keystone import exception from keystone.i18n import _, _LW from keystone.models import token_model -from keystone.openstack.common import log LOG = log.getLogger(__name__) diff --git a/keystone/common/environment/__init__.py b/keystone/common/environment/__init__.py index 29d8f7595e..da1de89006 100644 --- a/keystone/common/environment/__init__.py +++ b/keystone/common/environment/__init__.py @@ -15,7 +15,7 @@ import functools import os -from keystone.openstack.common import log +from oslo_log import log LOG = log.getLogger(__name__) diff --git a/keystone/common/environment/eventlet_server.py b/keystone/common/environment/eventlet_server.py index 77224dcbb9..f3a3c734c0 100644 --- a/keystone/common/environment/eventlet_server.py +++ b/keystone/common/environment/eventlet_server.py @@ -25,15 +25,16 @@ import sys import eventlet import eventlet.wsgi import greenlet +from oslo_log import log +from oslo_log import loggers from keystone.i18n import _LE, _LI -from keystone.openstack.common import log LOG = log.getLogger(__name__) -class EventletFilteringLogger(log.WritableLogger): +class EventletFilteringLogger(loggers.WritableLogger): # NOTE(morganfainberg): This logger is designed to filter out specific # Tracebacks to limit the amount of data that eventlet can log. In the # case of broken sockets (EPIPE and ECONNRESET), we are seeing a huge diff --git a/keystone/common/kvs/backends/memcached.py b/keystone/common/kvs/backends/memcached.py index 463243db8c..e25b0c3644 100644 --- a/keystone/common/kvs/backends/memcached.py +++ b/keystone/common/kvs/backends/memcached.py @@ -21,13 +21,13 @@ import time from dogpile.cache import api from dogpile.cache.backends import memcached +from oslo_log import log from keystone.common.cache.backends import memcache_pool from keystone.common import manager from keystone import config from keystone import exception from keystone.i18n import _ -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/common/kvs/core.py b/keystone/common/kvs/core.py index 6f3d695c88..984070c463 100644 --- a/keystone/common/kvs/core.py +++ b/keystone/common/kvs/core.py @@ -22,6 +22,7 @@ from dogpile.cache import proxy from dogpile.cache import region from dogpile.cache import util as dogpile_util from dogpile.core import nameregistry +from oslo_log import log from oslo_utils import importutils import six @@ -30,7 +31,6 @@ from keystone import exception from keystone.i18n import _ from keystone.i18n import _LI from keystone.i18n import _LW -from keystone.openstack.common import log __all__ = ['KeyValueStore', 'KeyValueStoreLock', 'LockTimeout', diff --git a/keystone/common/ldap/core.py b/keystone/common/ldap/core.py index 39916167cb..2dfe13b260 100644 --- a/keystone/common/ldap/core.py +++ b/keystone/common/ldap/core.py @@ -22,12 +22,12 @@ import weakref import ldap.filter import ldappool +from oslo_log import log import six from keystone import exception from keystone.i18n import _ from keystone.i18n import _LW -from keystone.openstack.common import log LOG = log.getLogger(__name__) diff --git a/keystone/common/openssl.py b/keystone/common/openssl.py index 5a3fa8d043..b063c3efcb 100644 --- a/keystone/common/openssl.py +++ b/keystone/common/openssl.py @@ -15,11 +15,12 @@ import os +from oslo_log import log + from keystone.common import environment from keystone.common import utils from keystone import config from keystone.i18n import _LI, _LE -from keystone.openstack.common import log LOG = log.getLogger(__name__) CONF = config.CONF diff --git a/keystone/common/sql/core.py b/keystone/common/sql/core.py index d94b302276..e4e58a0080 100644 --- a/keystone/common/sql/core.py +++ b/keystone/common/sql/core.py @@ -26,6 +26,7 @@ from oslo_db import exception as db_exception from oslo_db import options as db_options from oslo_db.sqlalchemy import models from oslo_db.sqlalchemy import session as db_session +from oslo_log import log from oslo_serialization import jsonutils import six import sqlalchemy as sql @@ -36,7 +37,6 @@ from sqlalchemy import types as sql_types from keystone.common import utils from keystone import exception from keystone.i18n import _ -from keystone.openstack.common import log CONF = cfg.CONF diff --git a/keystone/common/sql/migrate_repo/versions/034_havana.py b/keystone/common/sql/migrate_repo/versions/034_havana.py index 1ac6ac8002..06a2fc9383 100644 --- a/keystone/common/sql/migrate_repo/versions/034_havana.py +++ b/keystone/common/sql/migrate_repo/versions/034_havana.py @@ -11,13 +11,13 @@ # under the License. import migrate +from oslo_log import log import sqlalchemy as sql from sqlalchemy import orm from keystone.common import sql as ks_sql from keystone.common.sql import migration_helpers from keystone import config -from keystone.openstack.common import log LOG = log.getLogger(__name__) diff --git a/keystone/common/utils.py b/keystone/common/utils.py index 2508c69d06..1bd04f98b4 100644 --- a/keystone/common/utils.py +++ b/keystone/common/utils.py @@ -23,6 +23,7 @@ import hashlib import os import pwd +from oslo_log import log from oslo_serialization import jsonutils from oslo_utils import strutils import passlib.hash @@ -32,7 +33,6 @@ from six import moves from keystone.common import config from keystone import exception from keystone.i18n import _, _LE, _LW -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py index 05bd078a33..4ae37aa425 100644 --- a/keystone/common/wsgi.py +++ b/keystone/common/wsgi.py @@ -22,6 +22,7 @@ import copy import urllib import oslo_i18n +from oslo_log import log from oslo_serialization import jsonutils from oslo_utils import importutils from oslo_utils import strutils @@ -38,7 +39,6 @@ from keystone.i18n import _ from keystone.i18n import _LI from keystone.i18n import _LW from keystone.models import token_model -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/config.py b/keystone/config.py index 961efb159c..8979fe18e9 100644 --- a/keystone/config.py +++ b/keystone/config.py @@ -16,9 +16,10 @@ import logging import os +from oslo_log import log + from keystone.common import config from keystone import exception -from keystone.openstack.common import log CONF = config.CONF @@ -44,18 +45,13 @@ def set_default_for_default_log_levels(): 'keystone.common._memcache_pool=INFO', ] - def find_default_log_levels_opt(): - for opt in log.log_opts: - if opt.dest == 'default_log_levels': - return opt - - opt = find_default_log_levels_opt() - opt.default.extend(extra_log_level_defaults) + log.register_options(CONF) + CONF.default_log_levels.extend(extra_log_level_defaults) def setup_logging(): """Sets up logging for the keystone package.""" - log.setup('keystone') + log.setup(CONF, 'keystone') logging.captureWarnings(True) diff --git a/keystone/contrib/endpoint_filter/core.py b/keystone/contrib/endpoint_filter/core.py index 185634e516..cffd17375f 100644 --- a/keystone/contrib/endpoint_filter/core.py +++ b/keystone/contrib/endpoint_filter/core.py @@ -14,6 +14,7 @@ import abc +from oslo_log import log import six from keystone.common import dependency @@ -21,7 +22,6 @@ from keystone.common import extension from keystone.common import manager from keystone import config from keystone import exception -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/contrib/endpoint_policy/core.py b/keystone/contrib/endpoint_policy/core.py index faa8f0a95c..e388b118d2 100644 --- a/keystone/contrib/endpoint_policy/core.py +++ b/keystone/contrib/endpoint_policy/core.py @@ -14,6 +14,7 @@ import abc +from oslo_log import log import six from keystone.common import dependency @@ -21,7 +22,6 @@ from keystone.common import manager from keystone import config from keystone import exception from keystone.i18n import _, _LE, _LW -from keystone.openstack.common import log CONF = config.CONF LOG = log.getLogger(__name__) diff --git a/keystone/contrib/example/core.py b/keystone/contrib/example/core.py index 76c3ca7c70..6e85c7f7e2 100644 --- a/keystone/contrib/example/core.py +++ b/keystone/contrib/example/core.py @@ -12,13 +12,13 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log from keystone.common import dependency from keystone.common import manager from keystone import exception from keystone.i18n import _LI from keystone import notifications -from keystone.openstack.common import log LOG = log.getLogger(__name__) diff --git a/keystone/contrib/federation/core.py b/keystone/contrib/federation/core.py index 2e7c4951c4..971fb2a5b6 100644 --- a/keystone/contrib/federation/core.py +++ b/keystone/contrib/federation/core.py @@ -14,6 +14,7 @@ import abc +from oslo_log import log as logging import six from keystone.common import dependency @@ -21,7 +22,6 @@ from keystone.common import extension 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/contrib/federation/idp.py b/keystone/contrib/federation/idp.py index 21786b64c7..54850b4fb2 100644 --- a/keystone/contrib/federation/idp.py +++ b/keystone/contrib/federation/idp.py @@ -15,6 +15,7 @@ import os import subprocess import uuid +from oslo_log import log from oslo_utils import timeutils import saml2 from saml2 import md @@ -27,7 +28,6 @@ from keystone.common import config from keystone import exception from keystone.i18n import _, _LE from keystone.openstack.common import fileutils -from keystone.openstack.common import log LOG = log.getLogger(__name__) diff --git a/keystone/contrib/federation/utils.py b/keystone/contrib/federation/utils.py index c950826fdf..46b57532ba 100644 --- a/keystone/contrib/federation/utils.py +++ b/keystone/contrib/federation/utils.py @@ -15,13 +15,13 @@ import re import jsonschema +from oslo_log import log from oslo_utils import timeutils import six from keystone.common import config from keystone import exception from keystone.i18n import _, _LW -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/contrib/oauth1/validator.py b/keystone/contrib/oauth1/validator.py index c598516037..8f44059e3f 100644 --- a/keystone/contrib/oauth1/validator.py +++ b/keystone/contrib/oauth1/validator.py @@ -14,12 +14,12 @@ """oAuthlib request validator.""" +from oslo_log import log import six from keystone.common import dependency from keystone.contrib.oauth1 import core as oauth1 from keystone import exception -from keystone.openstack.common import log METHOD_NAME = 'oauth_validator' diff --git a/keystone/contrib/revoke/core.py b/keystone/contrib/revoke/core.py index 4149144635..9ca14f42cd 100644 --- a/keystone/contrib/revoke/core.py +++ b/keystone/contrib/revoke/core.py @@ -13,6 +13,7 @@ import abc import datetime +from oslo_log import log from oslo_utils import timeutils import six @@ -25,7 +26,6 @@ from keystone.contrib.revoke import model from keystone import exception from keystone.i18n import _ from keystone import notifications -from keystone.openstack.common import log from keystone.openstack.common import versionutils diff --git a/keystone/contrib/user_crud/core.py b/keystone/contrib/user_crud/core.py index 48563aaa8a..dd16d3a5e9 100644 --- a/keystone/contrib/user_crud/core.py +++ b/keystone/contrib/user_crud/core.py @@ -15,13 +15,14 @@ import copy import uuid +from oslo_log import log + from keystone.common import dependency from keystone.common import extension from keystone.common import wsgi from keystone import exception from keystone import identity from keystone.models import token_model -from keystone.openstack.common import log LOG = log.getLogger(__name__) diff --git a/keystone/controllers.py b/keystone/controllers.py index 5ca9677931..12f13c77b7 100644 --- a/keystone/controllers.py +++ b/keystone/controllers.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log from oslo_serialization import jsonutils import webob @@ -19,7 +20,6 @@ from keystone.common import extension from keystone.common import json_home from keystone.common import wsgi from keystone import exception -from keystone.openstack.common import log LOG = log.getLogger(__name__) diff --git a/keystone/credential/core.py b/keystone/credential/core.py index 23641c7874..e29011efbf 100644 --- a/keystone/credential/core.py +++ b/keystone/credential/core.py @@ -16,6 +16,7 @@ import abc +from oslo_log import log import six from keystone.common import dependency @@ -23,7 +24,6 @@ from keystone.common import driver_hints from keystone.common import manager from keystone import config from keystone import exception -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/exception.py b/keystone/exception.py index a0530f8b24..365ec6bbf0 100644 --- a/keystone/exception.py +++ b/keystone/exception.py @@ -12,12 +12,12 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log from oslo_utils import encodeutils import six from keystone.common import config from keystone.i18n import _, _LW -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/identity/backends/ldap.py b/keystone/identity/backends/ldap.py index 47d3fbbd93..52451ac3cb 100644 --- a/keystone/identity/backends/ldap.py +++ b/keystone/identity/backends/ldap.py @@ -16,6 +16,7 @@ import uuid import ldap import ldap.filter +from oslo_log import log import six from keystone import clean @@ -26,7 +27,6 @@ from keystone import config from keystone import exception from keystone.i18n import _ from keystone import identity -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/identity/controllers.py b/keystone/identity/controllers.py index 0752c8c310..c4b6583ca3 100644 --- a/keystone/identity/controllers.py +++ b/keystone/identity/controllers.py @@ -14,12 +14,13 @@ """Workflow Logic the Identity service.""" +from oslo_log import log + from keystone.common import controller from keystone.common import dependency from keystone import config from keystone import exception from keystone.i18n import _, _LW -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/identity/core.py b/keystone/identity/core.py index b24300b556..7f88a9c304 100644 --- a/keystone/identity/core.py +++ b/keystone/identity/core.py @@ -20,6 +20,7 @@ import os import uuid from oslo_config import cfg +from oslo_log import log from oslo_utils import importutils import six @@ -32,7 +33,6 @@ from keystone import exception from keystone.i18n import _, _LW from keystone.identity.mapping_backends import mapping from keystone import notifications -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/middleware/core.py b/keystone/middleware/core.py index 1e9e5774bd..9cf6838cf7 100644 --- a/keystone/middleware/core.py +++ b/keystone/middleware/core.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log from oslo_middleware import sizelimit from oslo_serialization import jsonutils import six @@ -22,7 +23,6 @@ from keystone.common import wsgi from keystone import exception from keystone.i18n import _LW from keystone.models import token_model -from keystone.openstack.common import log from keystone.openstack.common import versionutils CONF = config.CONF diff --git a/keystone/notifications.py b/keystone/notifications.py index 9afa6d2da9..f1f1d215dc 100644 --- a/keystone/notifications.py +++ b/keystone/notifications.py @@ -20,6 +20,7 @@ import logging import socket from oslo_config import cfg +from oslo_log import log import oslo_messaging import pycadf from pycadf import cadftaxonomy as taxonomy @@ -29,7 +30,6 @@ from pycadf import eventfactory from pycadf import resource from keystone.i18n import _, _LE -from keystone.openstack.common import log notifier_opts = [ diff --git a/keystone/policy/backends/rules.py b/keystone/policy/backends/rules.py index 0d6aa85e0b..4efe077ccb 100644 --- a/keystone/policy/backends/rules.py +++ b/keystone/policy/backends/rules.py @@ -17,10 +17,11 @@ import os.path +from oslo_log import log + from keystone.common import utils from keystone import config from keystone import exception -from keystone.openstack.common import log from keystone.openstack.common import policy as common_policy from keystone import policy diff --git a/keystone/resource/backends/ldap.py b/keystone/resource/backends/ldap.py index ed2d32ebc5..63a49b000d 100644 --- a/keystone/resource/backends/ldap.py +++ b/keystone/resource/backends/ldap.py @@ -14,6 +14,8 @@ from __future__ import absolute_import import uuid +from oslo_log import log + from keystone import clean from keystone.common import driver_hints from keystone.common import ldap as common_ldap @@ -22,7 +24,6 @@ from keystone import config from keystone import exception from keystone.i18n import _ from keystone.identity.backends import ldap as ldap_identity -from keystone.openstack.common import log from keystone import resource diff --git a/keystone/resource/backends/sql.py b/keystone/resource/backends/sql.py index 64e71c7b5a..df3b2580e5 100644 --- a/keystone/resource/backends/sql.py +++ b/keystone/resource/backends/sql.py @@ -10,12 +10,13 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log + from keystone import clean from keystone.common import sql from keystone import config from keystone import exception from keystone.i18n import _LE -from keystone.openstack.common import log from keystone import resource as keystone_resource diff --git a/keystone/resource/controllers.py b/keystone/resource/controllers.py index 872dcd6b30..d0ed1823c4 100644 --- a/keystone/resource/controllers.py +++ b/keystone/resource/controllers.py @@ -17,13 +17,14 @@ import uuid +from oslo_log import log + from keystone.common import controller from keystone.common import dependency from keystone.common import validation from keystone import config from keystone import exception from keystone.i18n import _ -from keystone.openstack.common import log from keystone.resource import schema diff --git a/keystone/resource/core.py b/keystone/resource/core.py index 4b5f1cd1bd..63def95a5c 100644 --- a/keystone/resource/core.py +++ b/keystone/resource/core.py @@ -14,6 +14,7 @@ import abc +from oslo_log import log import six from keystone import clean @@ -25,7 +26,6 @@ from keystone import config from keystone import exception from keystone.i18n import _, _LE from keystone import notifications -from keystone.openstack.common import log CONF = config.CONF diff --git a/keystone/service.py b/keystone/service.py index d987f00be7..fdac30a816 100644 --- a/keystone/service.py +++ b/keystone/service.py @@ -15,6 +15,7 @@ import functools import sys +from oslo_log import log from paste import deploy import routes @@ -26,7 +27,6 @@ from keystone import config from keystone import controllers from keystone import credential from keystone import identity -from keystone.openstack.common import log from keystone import policy from keystone import resource from keystone import routers diff --git a/keystone/tests/unit/core.py b/keystone/tests/unit/core.py index 261df9615b..a3109207e3 100644 --- a/keystone/tests/unit/core.py +++ b/keystone/tests/unit/core.py @@ -27,6 +27,7 @@ import warnings import fixtures from oslo_config import fixture as config_fixture +from oslo_log import log import oslotest.base as oslotest from oslotest import mockpatch import six @@ -50,7 +51,6 @@ from keystone import controllers from keystone import exception from keystone.i18n import _LW from keystone import notifications -from keystone.openstack.common import log from keystone.server import common from keystone import service from keystone.tests.unit import ksfixtures @@ -84,6 +84,7 @@ def _calc_tmpdir(): TMPDIR = _calc_tmpdir() CONF = config.CONF +log.register_options(CONF) IN_MEM_DB_CONN_STRING = 'sqlite://' diff --git a/keystone/tests/unit/fakeldap.py b/keystone/tests/unit/fakeldap.py index 61fe36e130..fdabcd1170 100644 --- a/keystone/tests/unit/fakeldap.py +++ b/keystone/tests/unit/fakeldap.py @@ -26,13 +26,13 @@ import re import shelve import ldap +from oslo_log import log import six from six import moves from keystone.common.ldap import core from keystone import config from keystone import exception -from keystone.openstack.common import log SCOPE_NAMES = { diff --git a/keystone/tests/unit/test_core.py b/keystone/tests/unit/test_core.py index 070a96b86c..db070b93a4 100644 --- a/keystone/tests/unit/test_core.py +++ b/keystone/tests/unit/test_core.py @@ -15,10 +15,10 @@ import sys import warnings +from oslo_log import log from sqlalchemy import exc from testtools import matchers -from keystone.openstack.common import log from keystone.tests import unit as tests diff --git a/keystone/tests/unit/test_v3_federation.py b/keystone/tests/unit/test_v3_federation.py index 6fbf26a439..edfd1c8f13 100644 --- a/keystone/tests/unit/test_v3_federation.py +++ b/keystone/tests/unit/test_v3_federation.py @@ -17,6 +17,7 @@ import uuid from lxml import etree import mock +from oslo_log import log from oslo_serialization import jsonutils from oslotest import mockpatch import saml2 @@ -32,7 +33,6 @@ from keystone.contrib.federation import idp as keystone_idp from keystone.contrib.federation import utils as mapping_utils from keystone import exception from keystone import notifications -from keystone.openstack.common import log from keystone.tests.unit import federation_fixtures from keystone.tests.unit import mapping_fixtures from keystone.tests.unit import test_v3 diff --git a/keystone/tests/unit/utils.py b/keystone/tests/unit/utils.py index 2d3c0986f7..f0bfbf0a33 100644 --- a/keystone/tests/unit/utils.py +++ b/keystone/tests/unit/utils.py @@ -17,11 +17,11 @@ import os import time import uuid +from oslo_log import log import six from testtools import testcase from keystone.common import environment -from keystone.openstack.common import log LOG = log.getLogger(__name__) diff --git a/keystone/token/controllers.py b/keystone/token/controllers.py index a5aede7f1a..ed40642387 100644 --- a/keystone/token/controllers.py +++ b/keystone/token/controllers.py @@ -16,6 +16,7 @@ import datetime import sys from keystoneclient.common import cms +from oslo_log import log from oslo_serialization import jsonutils from oslo_utils import timeutils import six @@ -27,7 +28,6 @@ from keystone import config from keystone import exception from keystone.i18n import _ from keystone.models import token_model -from keystone.openstack.common import log from keystone.token import provider diff --git a/keystone/token/core.py b/keystone/token/core.py index 52ee4a2a39..2b3efadc78 100644 --- a/keystone/token/core.py +++ b/keystone/token/core.py @@ -14,10 +14,11 @@ """Main entry point into the Token service.""" +from oslo_log import log + from keystone import config from keystone import exception from keystone.i18n import _ -from keystone.openstack.common import log from keystone.openstack.common import versionutils from keystone.token import persistence from keystone.token import provider diff --git a/keystone/token/persistence/backends/kvs.py b/keystone/token/persistence/backends/kvs.py index 325edadef1..6bca60d27e 100644 --- a/keystone/token/persistence/backends/kvs.py +++ b/keystone/token/persistence/backends/kvs.py @@ -16,6 +16,7 @@ from __future__ import absolute_import import copy +from oslo_log import log from oslo_utils import timeutils import six @@ -23,7 +24,6 @@ from keystone.common import kvs from keystone import config from keystone import exception from keystone.i18n import _, _LE, _LW -from keystone.openstack.common import log from keystone import token from keystone.token import provider diff --git a/keystone/token/persistence/backends/sql.py b/keystone/token/persistence/backends/sql.py index 0aa5b20848..0902287ecc 100644 --- a/keystone/token/persistence/backends/sql.py +++ b/keystone/token/persistence/backends/sql.py @@ -15,13 +15,13 @@ import copy import functools +from oslo_log import log from oslo_utils import timeutils from keystone.common import sql from keystone import config from keystone import exception from keystone.i18n import _LI -from keystone.openstack.common import log from keystone import token from keystone.token import provider diff --git a/keystone/token/persistence/core.py b/keystone/token/persistence/core.py index 2d509dad96..38ac5870f4 100644 --- a/keystone/token/persistence/core.py +++ b/keystone/token/persistence/core.py @@ -17,6 +17,7 @@ import abc import copy +from oslo_log import log from oslo_utils import timeutils import six @@ -26,7 +27,6 @@ from keystone.common import manager from keystone import config from keystone import exception from keystone.i18n import _LW -from keystone.openstack.common import log from keystone.openstack.common import versionutils diff --git a/keystone/token/provider.py b/keystone/token/provider.py index 0929c0e1c9..02b57168b1 100644 --- a/keystone/token/provider.py +++ b/keystone/token/provider.py @@ -21,6 +21,7 @@ import sys import uuid from keystoneclient.common import cms +from oslo_log import log from oslo_utils import timeutils import six @@ -32,7 +33,6 @@ from keystone import exception from keystone.i18n import _, _LE, _LW from keystone.models import token_model from keystone import notifications -from keystone.openstack.common import log from keystone.openstack.common import versionutils from keystone.token import persistence diff --git a/keystone/token/providers/common.py b/keystone/token/providers/common.py index f1dc0d8bf9..835fef7b6a 100644 --- a/keystone/token/providers/common.py +++ b/keystone/token/providers/common.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log from oslo_serialization import jsonutils from oslo_utils import timeutils import six @@ -22,7 +23,6 @@ from keystone import config from keystone.contrib import federation from keystone import exception from keystone.i18n import _, _LE -from keystone.openstack.common import log from keystone import token from keystone.token import provider diff --git a/keystone/token/providers/pki.py b/keystone/token/providers/pki.py index c70b86a885..d267e6e2f5 100644 --- a/keystone/token/providers/pki.py +++ b/keystone/token/providers/pki.py @@ -15,6 +15,7 @@ """Keystone PKI Token Provider""" from keystoneclient.common import cms +from oslo_log import log from oslo_serialization import jsonutils from keystone.common import environment @@ -22,7 +23,6 @@ from keystone.common import utils from keystone import config from keystone import exception from keystone.i18n import _, _LE -from keystone.openstack.common import log from keystone.token.providers import common diff --git a/keystone/token/providers/pkiz.py b/keystone/token/providers/pkiz.py index 9814bf4928..2ab8405099 100644 --- a/keystone/token/providers/pkiz.py +++ b/keystone/token/providers/pkiz.py @@ -13,6 +13,7 @@ """Keystone Compressed PKI Token Provider""" from keystoneclient.common import cms +from oslo_log import log from oslo_serialization import jsonutils from keystone.common import environment @@ -20,7 +21,6 @@ from keystone.common import utils from keystone import config from keystone import exception from keystone.i18n import _ -from keystone.openstack.common import log from keystone.token.providers import common diff --git a/keystone/trust/backends/sql.py b/keystone/trust/backends/sql.py index f2b479742b..4f5ee2e538 100644 --- a/keystone/trust/backends/sql.py +++ b/keystone/trust/backends/sql.py @@ -14,11 +14,11 @@ import time +from oslo_log import log from oslo_utils import timeutils from keystone.common import sql from keystone import exception -from keystone.openstack.common import log from keystone import trust diff --git a/keystone/trust/controllers.py b/keystone/trust/controllers.py index 2fa4f8fff6..86fdf9d0fe 100644 --- a/keystone/trust/controllers.py +++ b/keystone/trust/controllers.py @@ -14,6 +14,7 @@ import uuid +from oslo_log import log from oslo_utils import timeutils import six @@ -25,7 +26,6 @@ from keystone import config from keystone import exception from keystone.i18n import _ from keystone.models import token_model -from keystone.openstack.common import log from keystone.trust import schema diff --git a/keystone/trust/core.py b/keystone/trust/core.py index e38c502383..77e2914690 100644 --- a/keystone/trust/core.py +++ b/keystone/trust/core.py @@ -16,6 +16,7 @@ import abc +from oslo_log import log import six from keystone.common import dependency @@ -24,7 +25,6 @@ from keystone import config from keystone import exception from keystone.i18n import _ from keystone import notifications -from keystone.openstack.common import log CONF = config.CONF diff --git a/requirements-py3.txt b/requirements-py3.txt index e209c81014..5b8b4d61d3 100644 --- a/requirements-py3.txt +++ b/requirements-py3.txt @@ -25,6 +25,7 @@ oslo.config>=1.6.0 # Apache-2.0 # oslo.messaging>=1.6.0 # Apache-2.0 oslo.db>=1.4.1 # Apache-2.0 oslo.i18n>=1.3.0 # Apache-2.0 +oslo.log>=0.1.0 # Apache-2.0 oslo.middleware>=0.3.0 # Apache-2.0 oslo.serialization>=1.2.0 # Apache-2.0 oslo.utils>=1.2.0 # Apache-2.0 diff --git a/requirements.txt b/requirements.txt index de5e379548..6b973b1376 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,6 +23,7 @@ oslo.config>=1.6.0 # Apache-2.0 oslo.messaging>=1.6.0 # Apache-2.0 oslo.db>=1.4.1 # Apache-2.0 oslo.i18n>=1.3.0 # Apache-2.0 +oslo.log>=0.1.0 # Apache-2.0 oslo.middleware>=0.3.0 # Apache-2.0 oslo.serialization>=1.2.0 # Apache-2.0 oslo.utils>=1.2.0 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index 11b13effba..20ec098e25 100644 --- a/setup.cfg +++ b/setup.cfg @@ -67,5 +67,4 @@ oslo.config.opts = keystone = keystone.common.config:list_opts keystone.notifications = keystone.notifications:list_opts keystone.openstack.common.eventlet_backdoor = keystone.openstack.common.eventlet_backdoor:list_opts - keystone.openstack.common.log = keystone.openstack.common.log:list_opts keystone.openstack.common.policy = keystone.openstack.common.policy:list_opts