Merge "Remove useless global vars / import"

oslo/messaging/_drivers/common.py

@@ -33,7 +33,6 @@ from oslo.messaging.openstack.common import jsonutils
 # FIXME(markmc): remove this
 _ = lambda s: s
 
-CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 

oslo/messaging/_drivers/matchmaker_redis.py

@@ -18,8 +18,6 @@ The MatchMaker classes should accept a Topic or Fanout exchange key and
 return keys for direct exchanges, per (approximate) AMQP parlance.
 """
 
-import logging
-
 from oslo.config import cfg
 
 from oslo.messaging._drivers import matchmaker as mm_common
@@ -45,7 +43,6 @@ opt_group = cfg.OptGroup(name='matchmaker_redis',
                          title='Options for Redis-based MatchMaker')
 CONF.register_group(opt_group)
 CONF.register_opts(matchmaker_redis_opts, opt_group)
-LOG = logging.getLogger(__name__)
 
 
 class RedisExchange(mm_common.Exchange):

oslo/messaging/rpc/client.py

@@ -23,8 +23,6 @@ __all__ = [
     'RemoteError',
 ]
 
-import logging
-
 from oslo.config import cfg
 
 from oslo.messaging._drivers import base as driver_base
@@ -38,8 +36,6 @@ _client_opts = [
                help='Seconds to wait for a response from a call'),
 ]
 
-_LOG = logging.getLogger(__name__)
-
 
 class RemoteError(exceptions.MessagingException):
 

oslo/messaging/rpc/dispatcher.py

@@ -23,16 +23,12 @@ __all__ = [
     'UnsupportedVersion',
 ]
 
-import logging
-
 from oslo.messaging import _utils as utils
 from oslo.messaging import localcontext
 from oslo.messaging import serializer as msg_serializer
 from oslo.messaging import server as msg_server
 from oslo.messaging import target
 
-_LOG = logging.getLogger(__name__)
-
 
 class RPCDispatcherError(msg_server.MessagingServerError):
     "A base class for all RPC dispatcher exceptions."

oslo/messaging/server.py

@@ -23,17 +23,12 @@ __all__ = [
     'ServerListenError',
 ]
 
-import logging
-
 from stevedore import driver
 
 from oslo.messaging._drivers import base as driver_base
 from oslo.messaging import exceptions
 
 
-_LOG = logging.getLogger(__name__)
-
-
 class MessagingServerError(exceptions.MessagingException):
     """Base class for all MessageHandlingServer exceptions."""