Use oslo_log lib

Module 'log' from oslo-incubator was removed after release of oslo_log library.
So, start using oslo_log, but keep oslo-incubator code yet other common modules
within Manila codebase use it.

Implements bp use-oslo-log-lib

Change-Id: I88224f7c2bd99adb78140dfc3fa73cea437f29cd

manila/api/auth.py

@@ -14,12 +14,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log
+
 from manila.api.middleware import auth
 from manila.i18n import _LW
-from manila.openstack.common import log as logging
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 class ManilaKeystoneContext(auth.ManilaKeystoneContext):

manila/api/common.py

@@ -17,6 +17,7 @@ import os
 import re
 
 from oslo_config import cfg
+from oslo_log import log
 import six
 from six.moves.urllib import parse
 import webob
@@ -24,11 +25,10 @@ import webob
 from manila.api.openstack import wsgi
 from manila.api import xmlutil
 from manila.i18n import _
-from manila.openstack.common import log as logging
 from manila import utils
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 XML_NS_V1 = 'http://docs.openstack.org/volume/api/v1'
 
 

manila/api/contrib/__init__.py

@@ -20,12 +20,12 @@ It can't be called 'extensions' because that causes namespacing problems.
 """
 
 from oslo_config import cfg
+from oslo_log import log
 
 from manila.api import extensions
-from manila.openstack.common import log as logging
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 def standard_extensions(ext_mgr):

manila/api/contrib/admin_actions.py

@@ -12,6 +12,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
+from oslo_log import log
 import webob
 from webob import exc
 
@@ -19,11 +20,9 @@ from manila.api import extensions
 from manila.api.openstack import wsgi
 from manila import db
 from manila import exception
-from manila.openstack.common import log as logging
 from manila import share
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 class AdminController(wsgi.Controller):

manila/api/contrib/quotas.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
+from oslo_log import log
 from oslo_utils import strutils
 from six.moves.urllib import parse
 import webob
@@ -25,12 +25,11 @@ from manila import db
 from manila.db.sqlalchemy import api as sqlalchemy_api
 from manila import exception
 from manila.i18n import _
-from manila.openstack.common import log as logging
 from manila import quota
 
 
 QUOTAS = quota.QUOTAS
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 NON_QUOTA_KEYS = ['tenant_id', 'id', 'force']
 
 

manila/api/contrib/services.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log
 import webob.exc
 
 from manila.api import extensions
@@ -20,11 +21,9 @@ from manila.api.openstack import wsgi
 from manila.api import xmlutil
 from manila import db
 from manila import exception
-from manila.openstack.common import log as logging
 from manila import utils
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('share', 'services')
 
 

manila/api/extensions.py

@@ -17,6 +17,7 @@
 import os
 
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import importutils
 import six
 import webob.dec
@@ -29,11 +30,10 @@ from manila import exception
 from manila.i18n import _LE
 from manila.i18n import _LI
 from manila.i18n import _LW
-from manila.openstack.common import log as logging
 import manila.policy
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class ExtensionDescriptor(object):

manila/api/middleware/auth.py

@@ -19,6 +19,7 @@ Common Auth Middleware.
 import os
 
 from oslo_config import cfg
+from oslo_log import log
 from oslo_serialization import jsonutils
 import webob.dec
 import webob.exc
@@ -26,7 +27,6 @@ import webob.exc
 from manila.api.openstack import wsgi
 from manila import context
 from manila.i18n import _
-from manila.openstack.common import log as logging
 from manila import wsgi as base_wsgi
 
 use_forwarded_for_opt = cfg.BoolOpt(
@@ -37,7 +37,7 @@ use_forwarded_for_opt = cfg.BoolOpt(
 
 CONF = cfg.CONF
 CONF.register_opt(use_forwarded_for_opt)
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 def pipeline_factory(loader, global_conf, **local_conf):

manila/api/middleware/fault.py

@@ -14,6 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log
 import six
 import webob.dec
 import webob.exc
@@ -21,12 +22,10 @@ import webob.exc
 from manila.api.openstack import wsgi
 from manila.i18n import _LE
 from manila.i18n import _LI
-from manila.openstack.common import log as logging
 from manila import utils
 from manila import wsgi as base_wsgi
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 class FaultWrapper(base_wsgi.Middleware):

manila/api/middleware/sizelimit.py

@@ -17,12 +17,11 @@ Request Body limiting middleware.
 """
 
 from oslo_config import cfg
+from oslo_log import log
 import webob.dec
 import webob.exc
 
-
 from manila.i18n import _
-from manila.openstack.common import log as logging
 from manila import wsgi
 
 # default request size is 112k
@@ -33,7 +32,7 @@ max_request_body_size_opt = cfg.IntOpt(
 
 CONF = cfg.CONF
 CONF.register_opt(max_request_body_size_opt)
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class LimitingReader(object):

manila/api/openstack/__init__.py

@@ -18,17 +18,16 @@
 WSGI middleware for OpenStack API controllers.
 """
 
+from oslo_log import log
 import routes
 
 from manila.api.openstack import wsgi
-from manila.openstack.common import log as logging
 from manila.i18n import _
 from manila.i18n import _LW
 from manila import utils
 from manila import wsgi as base_wsgi
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 class APIMapper(routes.Mapper):

manila/api/openstack/urlmap.py

@@ -14,12 +14,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log
+
 from manila.api import urlmap
-from manila.openstack.common import log as logging
 from manila.i18n import _LW
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 def urlmap_factory(loader, global_conf, **local_conf):

manila/api/openstack/volume/__init__.py

@@ -14,11 +14,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log
+
 from manila.api.v1.router import APIRouter as v1_router
 from manila.i18n import _LW
-from manila.openstack.common import log as logging
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class APIRouter(v1_router):

manila/api/openstack/volume/versions.py

@@ -14,12 +14,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log
+
 from manila.api import versions
 from manila.i18n import _
-from manila.openstack.common import log as logging
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 class Versions(versions.Versions):

manila/api/openstack/wsgi.py

@@ -15,6 +15,7 @@
 
 import inspect
 import math
+from oslo_log import log
 from oslo_serialization import jsonutils
 import six
 import time
@@ -24,7 +25,6 @@ from manila import exception
 from manila.i18n import _
 from manila.i18n import _LE
 from manila.i18n import _LI
-from manila.openstack.common import log as logging
 from manila import utils
 from manila import wsgi
 
@@ -36,7 +36,7 @@ from xml.parsers import expat
 XMLNS_V1 = 'http://docs.openstack.org/volume/api/v1'
 XMLNS_ATOM = 'http://www.w3.org/2005/Atom'
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 # The vendor content types should serialize identically to the non-vendor
 # content types. So to avoid littering the code with both options, we

manila/api/sizelimit.py

@@ -14,11 +14,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log
+
 from manila.api.middleware import sizelimit
 from manila.i18n import _LW
-from manila.openstack.common import log as logging
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class RequestBodySizeLimiter(sizelimit.RequestBodySizeLimiter):

manila/api/urlmap.py

@@ -16,10 +16,10 @@
 import re
 import urllib2
 
+from oslo_log import log
 import paste.urlmap
 
 from manila.api.openstack import wsgi
-from manila.openstack.common import log as logging
 
 
 _quoted_string_re = r'"[^"\\]*(?:\\.[^"\\]*)*"'
@@ -28,7 +28,7 @@ _option_header_piece_re = re.compile(
     r'(?:=\s*([^;]+|%s))?\s*' %
     (_quoted_string_re, _quoted_string_re))
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 def unquote_header_value(value):

manila/api/v1/router.py

@@ -19,6 +19,8 @@
 WSGI middleware for OpenStack Share API.
 """
 
+from oslo_log import log
+
 from manila.api import extensions
 import manila.api.openstack
 from manila.api.v1 import limits
@@ -30,10 +32,8 @@ from manila.api.v1 import share_snapshots
 from manila.api.v1 import shares
 from manila.api.v1 import volume_types
 from manila.api import versions
-from manila.openstack.common import log as logging
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 class APIRouter(manila.api.openstack.APIRouter):

manila/api/v1/security_service.py

@@ -15,6 +15,7 @@
 
 """The security service api."""
 
+from oslo_log import log
 import six
 import webob
 from webob import exc
@@ -28,12 +29,11 @@ from manila import db
 from manila import exception
 from manila.i18n import _
 from manila.i18n import _LI
-from manila.openstack.common import log as logging
 from manila import policy
 
 
 RESOURCE_NAME = 'security_service'
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 def make_security_service(elem):

manila/api/v1/share_networks.py

@@ -16,6 +16,7 @@
 """The shares api."""
 
 from oslo_db import exception as db_exception
+from oslo_log import log
 from oslo_utils import timeutils
 import six
 import webob
@@ -30,14 +31,13 @@ from manila import exception
 from manila.i18n import _
 from manila.i18n import _LE
 from manila.i18n import _LW
-from manila.openstack.common import log as logging
 from manila import policy
 from manila import quota
 from manila.share import rpcapi as share_rpcapi
 
 RESOURCE_NAME = 'share_network'
 RESOURCES_NAME = 'share_networks'
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 QUOTAS = quota.QUOTAS
 SHARE_NETWORK_ATTRS = (
     'id',

manila/api/v1/share_servers.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log
 import six
 import webob
 from webob import exc
@@ -24,13 +25,12 @@ from manila.common import constants
 from manila.db import api as db_api
 from manila import exception
 from manila.i18n import _
-from manila.openstack.common import log as logging
 from manila import policy
 from manila import share
 
 RESOURCE_NAME = 'share_server'
 RESOURCES_NAME = 'share_servers'
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 SHARE_SERVER_ATTRS = (
     'id',
     'project_id',

manila/api/v1/share_snapshots.py

@@ -15,6 +15,7 @@
 
 """The share snapshots api."""
 
+from oslo_log import log
 import six
 import webob
 from webob import exc
@@ -25,11 +26,9 @@ from manila.api.views import share_snapshots as snapshot_views
 from manila.api import xmlutil
 from manila import exception
 from manila.i18n import _LI
-from manila.openstack.common import log as logging
 from manila import share
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 def make_snapshot(elem):

manila/api/v1/shares.py

@@ -17,6 +17,7 @@
 
 import ast
 
+from oslo_log import log
 from oslo_utils import uuidutils
 import six
 import webob
@@ -29,12 +30,10 @@ from manila.api import xmlutil
 from manila import exception
 from manila.i18n import _
 from manila.i18n import _LI
-from manila.openstack.common import log as logging
 from manila import share
 from manila.share import volume_types
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 def make_share(elem):

manila/compute/nova.py

@@ -25,12 +25,11 @@ from novaclient.v1_1 import client as nova_client
 from novaclient.v1_1.contrib import assisted_volume_snapshots
 from novaclient.v1_1 import servers as nova_servers
 from oslo_config import cfg
+from oslo_log import log
 
 from manila.db import base
 from manila import exception
 from manila.i18n import _
-from manila.openstack.common import log as logging
-
 
 nova_opts = [
     cfg.StrOpt('nova_catalog_info',
@@ -67,7 +66,7 @@ nova_opts = [
 CONF = cfg.CONF
 CONF.register_opts(nova_opts)
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 def novaclient(context):

manila/context.py

@@ -20,17 +20,16 @@
 import copy
 
 from oslo_context import context as common_context
+from oslo_log import log
 from oslo_utils import timeutils
 import six
 
 from manila.i18n import _
 from manila.i18n import _LW
 from manila.openstack.common import local
-from manila.openstack.common import log as logging
 from manila import policy
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 class RequestContext(object):

manila/db/migrations/alembic/versions/162a3e673105_manila_init.py

@@ -25,14 +25,13 @@ revision = '162a3e673105'
 down_revision = None
 
 from alembic import op
+from oslo_log import log
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey
 from sqlalchemy import Integer, MetaData, String, Table, UniqueConstraint
 
 from manila.i18n import _LE
-from manila.openstack.common import log as logging
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 def upgrade():

manila/db/sqlalchemy/api.py

@@ -26,6 +26,7 @@ from oslo_config import cfg
 from oslo_db import exception as db_exception
 from oslo_db import options as db_options
 from oslo_db.sqlalchemy import session
+from oslo_log import log
 from oslo_utils import timeutils
 import six
 from sqlalchemy import or_
@@ -39,12 +40,11 @@ from manila import exception
 from manila.i18n import _
 from manila.i18n import _LE
 from manila.i18n import _LW
-from manila.openstack.common import log as logging
 
 
 CONF = cfg.CONF
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 _DEFAULT_QUOTA_NAME = 'default'
 PER_PROJECT_QUOTAS = []

manila/exception.py

@@ -24,14 +24,14 @@ SHOULD include dedicated exception logging.
 
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_log import log
 import six
 import webob.exc
 
 from manila.i18n import _
 from manila.i18n import _LE
-from manila.openstack.common import log as logging
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 exc_log_opts = [
     cfg.BoolOpt('fatal_exception_format_errors',

manila/manager.py

@@ -52,18 +52,16 @@ This module provides Manager, a base class for managers.
 """
 
 from oslo_config import cfg
+from oslo_log import log
 import six
 
 from manila.db import base
 from manila.i18n import _LE
-from manila.openstack.common import log as logging
 from manila.scheduler import rpcapi as scheduler_rpcapi
 from manila import version
 
 CONF = cfg.CONF
-
+LOG = log.getLogger(__name__)
-
-LOG = logging.getLogger(__name__)
 
 
 def periodic_task(*args, **kwargs):

manila/network/linux/interface.py

@@ -17,6 +17,7 @@ import abc
 
 import netaddr
 from oslo_config import cfg
+from oslo_log import log
 import six
 
 from manila import exception
@@ -25,11 +26,10 @@ from manila.i18n import _LE
 from manila.i18n import _LW
 from manila.network.linux import ip_lib
 from manila.network.linux import ovs_lib
-from manila.openstack.common import log as logging
 from manila import utils
 
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 OPTS = [
     cfg.StrOpt('ovs_integration_bridge',

manila/network/linux/ovs_lib.py

@@ -15,11 +15,12 @@
 
 import re
 
+from oslo_log import log
+
 from manila.i18n import _LE
-from manila.openstack.common import log as logging
 from manila import utils
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class OVSBridge:

manila/network/neutron/api.py

@@ -17,13 +17,13 @@
 from neutronclient.common import exceptions as neutron_client_exc
 from neutronclient.v2_0 import client as clientv20
 from oslo_config import cfg
+from oslo_log import log
 
 from manila import context
 from manila.db import base
 from manila import exception
 from manila.i18n import _LE
 from manila.network.neutron import constants as neutron_constants
-from manila.openstack.common import log as logging
 
 neutron_opts = [
     cfg.StrOpt(
@@ -74,7 +74,7 @@ neutron_opts = [
 ]
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class API(base.Base):

manila/network/neutron/neutron_network_plugin.py

@@ -15,13 +15,13 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log
 
 from manila.common import constants
 from manila import exception
 from manila import network
 from manila.network.neutron import api as neutron_api
 from manila.network.neutron import constants as neutron_constants
-from manila.openstack.common import log as logging
 
 neutron_single_network_plugin_opts = [
     cfg.StrOpt(
@@ -40,7 +40,7 @@ neutron_single_network_plugin_opts = [
 ]
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class NeutronNetworkPlugin(network.NetworkBaseAPI):

manila/opts.py

@@ -21,6 +21,7 @@ import copy
 import itertools
 
 import oslo_concurrency.opts
+import oslo_log._options
 
 import manila.api.middleware.auth
 import manila.api.middleware.sizelimit
@@ -128,6 +129,7 @@ _opts = [
 ]
 
 _opts.extend(oslo_concurrency.opts.list_opts())
+_opts.extend(oslo_log._options.list_opts())
 
 
 def list_opts():

manila/quota.py

@@ -19,6 +19,7 @@
 import datetime
 
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import importutils
 from oslo_utils import timeutils
 import six
@@ -26,9 +27,8 @@ import six
 from manila import db
 from manila import exception
 from manila.i18n import _LE
-from manila.openstack.common import log as logging
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 quota_opts = [
     cfg.IntOpt('quota_shares',

manila/scheduler/filter_scheduler.py

@@ -21,16 +21,16 @@ Weighing Functions.
 """
 
 from oslo_config import cfg
+from oslo_log import log
 
 from manila import exception
 from manila.i18n import _
 from manila.i18n import _LE
-from manila.openstack.common import log as logging
 from manila.scheduler import driver
 from manila.scheduler import scheduler_options
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class FilterScheduler(driver.Scheduler):

manila/scheduler/filters/capacity_filter.py

@@ -18,13 +18,13 @@
 
 import math
 
+from oslo_log import log
+
 from manila.i18n import _LE
 from manila.i18n import _LW
-from manila.openstack.common import log as logging
 from manila.openstack.common.scheduler import filters
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 class CapacityFilter(filters.BaseHostFilter):

manila/scheduler/filters/retry_filter.py

@@ -13,10 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from manila.openstack.common import log as logging
+from oslo_log import log
+
 from manila.openstack.common.scheduler import filters
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class RetryFilter(filters.BaseHostFilter):

manila/scheduler/host_manager.py

@@ -21,13 +21,13 @@ Manage hosts in the current zone.
 import UserDict
 
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import timeutils
 import six
 
 from manila import db
 from manila import exception
 from manila.i18n import _LI
-from manila.openstack.common import log as logging
 from manila.openstack.common.scheduler import filters
 from manila.openstack.common.scheduler import weights
 from manila.share import utils as share_utils
@@ -52,7 +52,7 @@ host_manager_opts = [
 CONF = cfg.CONF
 CONF.register_opts(host_manager_opts)
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class ReadOnlyDict(UserDict.IterableUserDict):

manila/scheduler/manager.py

@@ -21,6 +21,7 @@ Scheduler Service
 
 from oslo import messaging
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import excutils
 from oslo_utils import importutils
 
@@ -29,11 +30,10 @@ from manila import db
 from manila import exception
 from manila.i18n import _LW
 from manila import manager
-from manila.openstack.common import log as logging
 from manila import rpc
 from manila.share import rpcapi as share_rpcapi
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 scheduler_driver_opt = cfg.StrOpt('scheduler_driver',
                                   default='manila.scheduler.filter_scheduler.'

manila/scheduler/scheduler_options.py

@@ -24,11 +24,11 @@ import datetime
 import os
 
 from oslo_config import cfg
+from oslo_log import log
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 
 from manila.i18n import _LE
-from manila.openstack.common import log as logging
 
 scheduler_json_config_location_opt = cfg.StrOpt(
     'scheduler_json_config_location',
@@ -38,7 +38,7 @@ scheduler_json_config_location_opt = cfg.StrOpt(
 CONF = cfg.CONF
 CONF.register_opt(scheduler_json_config_location_opt)
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class SchedulerOptions(object):

manila/service.py

@@ -29,6 +29,7 @@ import eventlet
 import greenlet
 from oslo import messaging
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import importutils
 
 from manila import context
@@ -37,13 +38,12 @@ from manila import exception
 from manila.i18n import _LE
 from manila.i18n import _LI
 from manila.i18n import _LW
-from manila.openstack.common import log as logging
 from manila.openstack.common import loopingcall
 from manila import rpc
 from manila import version
 from manila import wsgi
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 service_opts = [
     cfg.IntOpt('report_interval',

manila/share/api.py

@@ -19,6 +19,7 @@ Handles all requests relating to shares.
 """
 
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import excutils
 from oslo_utils import timeutils
 import six
@@ -30,7 +31,6 @@ from manila import exception
 from manila.i18n import _
 from manila.i18n import _LE
 from manila.i18n import _LW
-from manila.openstack.common import log as logging
 from manila import policy
 from manila import quota
 from manila.scheduler import rpcapi as scheduler_rpcapi
@@ -47,7 +47,7 @@ share_api_opts = [
 CONF = cfg.CONF
 CONF.register_opts(share_api_opts)
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 GB = 1048576 * 1024
 QUOTAS = quota.QUOTAS
 

manila/share/configuration.py

@@ -43,12 +43,10 @@ and registered in the group in which they are used.
 """
 
 from oslo_config import cfg
-
+from oslo_log import log
-from manila.openstack.common import log as logging
-
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class Configuration(object):

manila/share/driver.py

@@ -21,14 +21,14 @@ Drivers for shares.
 import time
 
 from oslo_config import cfg
+from oslo_log import log
 
 from manila import exception
 from manila.i18n import _LE
 from manila import network
-from manila.openstack.common import log as logging
 from manila import utils
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 share_opts = [
     # NOTE(rushiagr): Reasonable to define this option at only one place.

manila/share/drivers/emc/driver.py

@@ -21,8 +21,8 @@ to specify, which backend plugins to use.
 """
 
 from oslo_config import cfg
+from oslo_log import log
 
-from manila.openstack.common import log
 from manila.share import driver
 from manila.share.drivers.emc import plugin_manager as manager
 

manila/share/drivers/emc/plugins/vnx/connection.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 """VNX backend for the EMC Manila driver."""
+from oslo_log import log
 from oslo_utils import excutils
 from oslo_utils import units
 import six
@@ -22,7 +23,6 @@ from manila import exception
 from manila.i18n import _
 from manila.i18n import _LE
 from manila.i18n import _LW
-from manila.openstack.common import log
 from manila.share.drivers.emc.plugins import base as driver
 from manila.share.drivers.emc.plugins.vnx import constants
 from manila.share.drivers.emc.plugins.vnx import helper

manila/share/drivers/emc/plugins/vnx/helper.py

@@ -17,6 +17,7 @@ import random
 import re
 
 from eventlet import greenthread
+from oslo_log import log
 import six
 from six.moves.urllib import error as url_error  # pylint: disable=E0611
 from six.moves.urllib import request as url_request  # pylint: disable=E0611
@@ -26,15 +27,13 @@ from manila.i18n import _
 from manila.i18n import _LE
 from manila.i18n import _LI
 from manila.i18n import _LW
-from manila.openstack.common import log as logging
 from manila.share.drivers.emc.plugins.vnx import constants
 from manila.share.drivers.emc.plugins.vnx import utils as vnx_utils
 from manila.share.drivers.emc.plugins.vnx import xml_api_parser as parser
 from manila.share.drivers.emc.plugins.vnx import xml_api_schema as schema
 from manila import utils
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 class XMLAPIConnector(object):

manila/share/drivers/emc/plugins/vnx/utils.py

@@ -15,11 +15,9 @@
 import types
 
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import timeutils
 
-from manila.openstack.common import log
-
-
 CONF = cfg.CONF
 LOG = log.getLogger(__name__)
 

manila/share/drivers/emc/plugins/vnx/xml_api_parser.py

@@ -15,9 +15,9 @@
 import types
 import xml.dom.minidom
 
-from manila.i18n import _LW
+from oslo_log import log
-from manila.openstack.common import log
 
+from manila.i18n import _LW
 
 LOG = log.getLogger(__name__)
 

manila/share/drivers/ganesha/__init__.py

@@ -19,17 +19,16 @@ import os
 import re
 
 from oslo_config import cfg
+from oslo_log import log
 import six
 
 from manila import exception
 from manila.i18n import _LI
-from manila.openstack.common import log as logging
 from manila.share.drivers.ganesha import manager as ganesha_manager
 from manila.share.drivers.ganesha import utils as ganesha_utils
 
-
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 @six.add_metaclass(abc.ABCMeta)

manila/share/drivers/ganesha/manager.py

@@ -18,18 +18,17 @@ import pipes
 import re
 import sys
 
+from oslo_log import log
 from oslo_serialization import jsonutils
 import six
 
 from manila import exception
 from manila.i18n import _
 from manila.i18n import _LE
-from manila.openstack.common import log as logging
 from manila.share.drivers.ganesha import utils as ganesha_utils
 from manila import utils
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 IWIDTH = 4
 
 

manila/share/drivers/generic.py

@@ -21,6 +21,7 @@ import time
 
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import excutils
 from oslo_utils import importutils
 import six
@@ -32,14 +33,12 @@ from manila import exception
 from manila.i18n import _
 from manila.i18n import _LE
 from manila.i18n import _LW
-from manila.openstack.common import log as logging
 from manila.share import driver
 from manila.share.drivers import service_instance
 from manila import utils
 from manila import volume
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 share_opts = [
     cfg.StrOpt('smb_template_config_path',

manila/share/drivers/glusterfs.py

@@ -30,19 +30,18 @@ import sys
 import xml.etree.cElementTree as etree
 
 from oslo_config import cfg
+from oslo_log import log
 import six
 
 from manila import exception
 from manila.i18n import _
 from manila.i18n import _LE
 from manila.i18n import _LW
-from manila.openstack.common import log as logging
 from manila.share import driver
 from manila.share.drivers import ganesha
 from manila.share.drivers.ganesha import utils as ganesha_utils
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 GlusterfsManilaShare_opts = [
     cfg.StrOpt('glusterfs_target',

manila/share/drivers/glusterfs_native.py

@@ -31,18 +31,17 @@ import shutil
 import tempfile
 
 from oslo_config import cfg
+from oslo_log import log
 import six
 
 from manila import exception
 from manila.i18n import _
 from manila.i18n import _LI
-from manila.openstack.common import log as logging
 from manila.share import driver
 from manila.share.drivers import glusterfs
 from manila import utils
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 glusterfs_native_manila_share_opts = [
     cfg.ListOpt('glusterfs_targets',

manila/share/drivers/hds/sop.py

@@ -23,17 +23,16 @@ import time
 
 import httplib2
 from oslo_config import cfg
+from oslo_log import log
 from oslo_serialization import jsonutils as json
 from oslo_utils import units
 import six
 
 from manila import exception
 from manila.i18n import _LW
-from manila.openstack.common import log as logging
 from manila.share import driver
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 hdssop_share_opts = [
     cfg.StrOpt('hdssop_target',

manila/share/drivers/huawei/huawei_helper.py

@@ -16,6 +16,7 @@
 import base64
 from xml import etree
 
+from oslo_log import log
 from oslo_serialization import jsonutils
 from oslo_utils import units
 import six
@@ -24,11 +25,10 @@ from six.moves.urllib import request as urlreq  # pylint: disable=E0611
 
 from manila import exception
 from manila.i18n import _, _LE, _LW
-from manila.openstack.common import log as logging
 from manila.share.drivers.huawei import constants
 from manila import utils
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class RestHelper():

manila/share/drivers/huawei/huawei_nas.py

@@ -17,12 +17,12 @@
 import time
 
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import excutils
 from oslo_utils import units
 
 from manila import exception
 from manila.i18n import _, _LI, _LW
-from manila.openstack.common import log as logging
 from manila.openstack.common import loopingcall
 from manila.share import driver
 from manila.share.drivers.huawei import constants
@@ -35,7 +35,7 @@ huawei_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(huawei_opts)
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class HuaweiNasDriver(driver.ShareDriver):

manila/share/drivers/ibm/ganesha_utils.py

@@ -30,14 +30,14 @@ import socket
 import time
 
 import netaddr
+from oslo_log import log
 import six
 
 from manila import exception
 from manila.i18n import _, _LI
-from manila.openstack.common import log as logging
 from manila import utils
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 # more simple pattern for matching a single avpair per line,
 # skips lines starting with # comment char
 AVPATTERN = re.compile('^\s*(?!#)\s*(?P<attr>\S+)\s*=\s*(?P<val>\S+)\s*;')

manila/share/drivers/ibm/gpfs.py

@@ -38,6 +38,7 @@ import socket
 
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import excutils
 from oslo_utils import importutils
 from oslo_utils import units
@@ -45,12 +46,11 @@ import six
 
 from manila import exception
 from manila.i18n import _, _LE, _LI
-from manila.openstack.common import log as logging
 from manila.share import driver
 from manila.share.drivers.ibm import ganesha_utils
 from manila import utils
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 # matches multiple comma separated avpairs on a line.  values with an embedded
 # comma must be wrapped in quotation marks

manila/share/drivers/netapp/api.py

@@ -21,9 +21,9 @@ Contains classes required to issue api calls to ONTAP and OnCommand DFM.
 import urllib2
 
 from lxml import etree
+from oslo_log import log
 
 from manila.i18n import _
-from manila.openstack.common import log
 
 
 LOG = log.getLogger(__name__)

manila/share/drivers/netapp/cluster_mode.py

@@ -25,6 +25,7 @@ import hashlib
 import re
 
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import excutils
 from oslo_utils import units
 import six
@@ -34,7 +35,6 @@ from manila import exception
 from manila.i18n import _
 from manila.i18n import _LE
 from manila.i18n import _LI
-from manila.openstack.common import log
 from manila.share import driver
 from manila.share.drivers.netapp import api as naapi
 from manila.share.drivers.netapp import utils as na_utils

manila/share/drivers/netapp/common.py

@@ -17,17 +17,16 @@ Unified driver for NetApp storage systems.
 Supports multiple storage systems of different families and driver modes.
 """
 
+from oslo_log import log
 from oslo_utils import importutils
 
 from manila import exception
 from manila.i18n import _, _LI
-from manila.openstack.common import log as logging
 from manila.share import driver
 from manila.share.drivers.netapp import cluster_mode
 from manila.share.drivers.netapp import utils as na_utils
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 # Add new drivers here, no other code changes required.
 NETAPP_UNIFIED_DRIVER_REGISTRY = {

manila/share/drivers/netapp/utils.py

@@ -20,16 +20,15 @@ import platform
 import socket
 
 from oslo_concurrency import processutils as putils
+from oslo_log import log
 from oslo_utils import timeutils
 
 from manila import exception
 from manila.i18n import _, _LI, _LW
-from manila.openstack.common import log as logging
 from manila.share.drivers.netapp import api as na_api
 from manila import version
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 VALID_TRACE_FLAGS = ['method', 'api']

manila/share/drivers/service_instance.py

@@ -23,6 +23,7 @@ import time
 
 import netaddr
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import importutils
 import six
 
@@ -34,11 +35,9 @@ from manila.i18n import _
 from manila.i18n import _LW
 from manila.network.linux import ip_lib
 from manila.network.neutron import api as neutron
-from manila.openstack.common import log as logging
 from manila import utils
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 share_servers_handling_mode_opts = [
     cfg.StrOpt('service_image_name',

manila/share/drivers/zfssa/zfssarest.py

@@ -14,12 +14,12 @@
 """
 ZFS Storage Appliance Proxy
 """
+from oslo_log import log
 from oslo_serialization import jsonutils
 
 from manila import exception
 from manila.i18n import _
 from manila.i18n import _LE
-from manila.openstack.common import log
 from manila.share.drivers.zfssa import restclient
 
 

manila/share/drivers/zfssa/zfssashare.py

@@ -18,12 +18,12 @@ ZFS Storage Appliance Manila Share Driver
 import base64
 
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import units
 
 from manila import exception
 from manila.i18n import _
 from manila.i18n import _LE
-from manila.openstack.common import log
 from manila.share import driver
 from manila.share.drivers.zfssa import zfssarest
 

manila/share/manager.py

@@ -20,6 +20,7 @@
 """
 
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import excutils
 from oslo_utils import importutils
 from oslo_utils import timeutils
@@ -32,13 +33,12 @@ from manila.i18n import _LE
 from manila.i18n import _LI
 from manila.i18n import _LW
 from manila import manager
-from manila.openstack.common import log as logging
 from manila import quota
 import manila.share.configuration
 from manila.share import utils as share_utils
 from manila import utils
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 share_manager_opts = [
     cfg.StrOpt('share_driver',

manila/share/volume_types.py

@@ -17,6 +17,7 @@
 
 from oslo_config import cfg
 from oslo_db import exception as db_exception
+from oslo_log import log
 import six
 
 from manila import context
@@ -24,10 +25,9 @@ from manila import db
 from manila import exception
 from manila.i18n import _
 from manila.i18n import _LE
-from manila.openstack.common import log as logging
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 def create(context, name, extra_specs={}):

manila/test.py

@@ -31,13 +31,13 @@ from oslo.messaging import conffixture as messaging_conffixture
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_config import fixture as config_fixture
+from oslo_log import log
 import oslotest.base as base_test
 import six
 
 from manila.db import migration
 from manila.db.sqlalchemy import api as db_api
 from manila.db.sqlalchemy import models as db_models
-from manila.openstack.common import log as logging
 from manila import rpc
 from manila import service
 from manila.tests import conf_fixture
@@ -52,7 +52,7 @@ test_opts = [
 CONF = cfg.CONF
 CONF.register_opts(test_opts)
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 _DB_CACHE = None
 

manila/tests/api/test_router.py

@@ -14,17 +14,17 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log
 
 from manila.api.openstack import wsgi
 from manila.api.v1 import router
 from manila.api import versions
-from manila.openstack.common import log as logging
 from manila import test
 from manila.tests.api import fakes
 
 CONF = cfg.CONF
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class FakeController(object):

manila/tests/db/migrations/alembic/test_migration.py

@@ -21,12 +21,12 @@ from alembic import script
 import mock
 from oslo_db.sqlalchemy import test_base
 from oslo_db.sqlalchemy import test_migrations
+from oslo_log import log
 from sqlalchemy.sql import text
 
 from manila.db.migrations.alembic import migration
-from manila.openstack.common import log as logging
 
-LOG = logging.getLogger('manila.tests.test_migrations')
+LOG = log.getLogger('manila.tests.test_migrations')
 
 
 class ManilaMigrationsCheckers(test_migrations.WalkVersionsMixin):

manila/tests/fake_compute.py

@@ -15,12 +15,10 @@
 
 
 from oslo_config import cfg
-
+from oslo_log import log
-from manila.openstack.common import log as logging
-
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class FakeServer(object):

manila/tests/fake_driver.py

@@ -14,11 +14,11 @@
 #    under the License.
 
 import mock
+from oslo_log import log
 
-from manila.openstack.common import log as logging
 from manila.share import driver
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class FakeShareDriver(driver.ShareDriver):

manila/tests/fake_network.py

@@ -16,12 +16,10 @@
 import uuid
 
 from oslo_config import cfg
-
+from oslo_log import log
-from manila.openstack.common import log as logging
-
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class FakeNetwork(object):

manila/tests/fake_service_instance.py

@@ -13,11 +13,11 @@
 #    under the License.
 
 import mock
+from oslo_log import log
 
-from manila.openstack.common import log as logging
 from manila.tests import fake_compute
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class FakeServiceInstanceManager(object):

manila/tests/fake_utils.py

@@ -17,13 +17,13 @@
 import re
 
 from eventlet import greenthread
+from oslo_log import log
 import six
 
 from manila import exception
-from manila.openstack.common import log as logging
 from manila import utils
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 _fake_execute_repliers = []
 _fake_execute_log = []

manila/tests/fake_volume.py

@@ -15,12 +15,10 @@
 
 
 from oslo_config import cfg
-
+from oslo_log import log
-from manila.openstack.common import log as logging
-
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class FakeVolume(object):

manila/tests/integrated/api/client.py

@@ -14,13 +14,11 @@
 
 import httplib
 
+from oslo_log import log
 from oslo_serialization import jsonutils
 from six.moves.urllib import parse
 
-from manila.openstack.common import log as logging
+LOG = log.getLogger(__name__)
-
-
-LOG = logging.getLogger(__name__)
 
 
 class OpenStackApiException(Exception):

manila/tests/integrated/integrated_helpers.py

@@ -21,8 +21,8 @@ import random
 import string
 import uuid
 
+from oslo_log import log
 
-from manila.openstack.common import log as logging
 from manila import service
 from manila import test  # For the flags
 from manila.tests.integrated.api import client
@@ -30,7 +30,7 @@ from manila.tests.integrated.api import client
 from oslo_config import cfg
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 def generate_random_alphanumeric(length):

manila/tests/integrated/test_extensions.py

@@ -14,13 +14,12 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log
 
-from manila.openstack.common import log as logging
 from manila.tests.integrated import integrated_helpers
 
-
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class ExtensionsTest(integrated_helpers._IntegratedTestBase):

manila/tests/integrated/test_login.py

@@ -13,11 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from manila.openstack.common import log as logging
+from oslo_log import log
+
 from manila.tests.integrated import integrated_helpers
 
-
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 class LoginTest(integrated_helpers._IntegratedTestBase):

manila/tests/share/drivers/emc/test_driver.py

@@ -14,15 +14,15 @@
 #    under the License.
 
 import mock
+from oslo_log import log
 from stevedore import extension
 
-from manila.openstack.common import log as logging
 from manila.share import configuration as conf
 from manila.share.drivers.emc import driver as emcdriver
 from manila.share.drivers.emc.plugins import base
 from manila import test
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class FakeConnection(base.StorageConnection):

manila/tests/share/drivers/emc/test_emc_vnx.py

@@ -14,18 +14,18 @@
 #    under the License.
 import ddt
 import mock
+from oslo_log import log
 from oslo_utils import units
 
 import manila.db
 from manila import exception
-from manila.openstack.common import log as logging
 from manila.share import configuration as conf
 from manila.share.drivers.emc import driver as emc_driver
 from manila.share.drivers.emc.plugins.vnx import helper
 from manila import test
 from manila.tests import fake_share
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 def query(func):

manila/tests/share/drivers/zfssa/test_zfssarest.py

@@ -15,9 +15,9 @@
 Unit tests for Oracle's ZFSSA REST API.
 """
 import mock
+from oslo_log import log
 
 from manila import exception
-from manila.openstack.common import log
 from manila.share.drivers.zfssa import restclient
 from manila.share.drivers.zfssa import zfssarest
 from manila import test

manila/utils.py

@@ -36,6 +36,7 @@ import netaddr
 from oslo_concurrency import lockutils
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import importutils
 from oslo_utils import timeutils
 import paramiko
@@ -43,11 +44,9 @@ import six
 
 from manila import exception
 from manila.i18n import _
-from manila.openstack.common import log as logging
-
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 synchronized = lockutils.synchronized_with_prefix('manila-')
 

manila/volume/cinder.py

@@ -24,11 +24,11 @@ from cinderclient import exceptions as cinder_exception
 from cinderclient import service_catalog
 from cinderclient.v2 import client as cinder_client
 from oslo_config import cfg
+from oslo_log import log
 
 from manila.db import base
 from manila import exception
 from manila.i18n import _
-from manila.openstack.common import log as logging
 
 
 cinder_opts = [
@@ -68,7 +68,7 @@ cinder_opts = [
 CONF = cfg.CONF
 CONF.register_opts(cinder_opts)
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 def cinderclient(context):

manila/wsgi.py

@@ -30,6 +30,8 @@ import eventlet
 import eventlet.wsgi
 import greenlet
 from oslo_config import cfg
+from oslo_log import log
+from oslo_log import loggers
 from oslo_utils import netutils
 from paste import deploy
 import routes.middleware
@@ -40,7 +42,6 @@ import webob.exc
 from manila import exception
 from manila.i18n import _
 from manila.i18n import _LI
-from manila.openstack.common import log as logging
 
 socket_opts = [
     cfg.IntOpt('backlog',
@@ -88,8 +89,7 @@ CONF = cfg.CONF
 CONF.register_opts(socket_opts)
 CONF.register_opts(eventlet_opts)
 
-CONF = cfg.CONF
+LOG = log.getLogger(__name__)
-LOG = logging.getLogger(__name__)
 
 
 class Server(object):
@@ -118,8 +118,8 @@ class Server(object):
         self._socket = None
         self._protocol = protocol
         self._pool = eventlet.GreenPool(pool_size or self.default_pool_size)
-        self._logger = logging.getLogger("eventlet.wsgi.server")
+        self._logger = log.getLogger("eventlet.wsgi.server")
-        self._wsgi_logger = logging.WritableLogger(self._logger)
+        self._wsgi_logger = loggers.WritableLogger(self._logger)
 
     def _get_socket(self, host, port, backlog):
         bind_addr = (host, port)

requirements.txt

@@ -16,6 +16,7 @@ oslo.config>=1.6.0  # Apache-2.0
 oslo.context>=0.1.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.messaging>=1.6.0  # Apache-2.0
 oslo.rootwrap>=1.5.0  # Apache-2.0
 oslo.serialization>=1.2.0               # Apache-2.0