diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-12-03 13:34:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-12-03 13:34:30 +0000 |
| commit | fda06f68062fcd81817a48e0f8ad2fd1139a59dc (patch) | |
| tree | da43fbabd57aabda1db333b6ae0fdba774f48e8c | |
| parent | 2b9bafd269a34c2e0b434adf3331fa67b35b5a6d (diff) | |
| parent | 97b9deca88915d2e7af34463e31f52ba3c2c9033 (diff) | |
| download | oslo-messaging-1.3.0a2.tar.gz | |
Merge "Remove useless global vars / import"1.3.0a2
| -rw-r--r-- | oslo/messaging/_drivers/common.py | 1 | ||||
| -rw-r--r-- | oslo/messaging/_drivers/matchmaker_redis.py | 3 | ||||
| -rw-r--r-- | oslo/messaging/rpc/client.py | 4 | ||||
| -rw-r--r-- | oslo/messaging/rpc/dispatcher.py | 4 | ||||
| -rw-r--r-- | oslo/messaging/server.py | 5 |
5 files changed, 0 insertions, 17 deletions
diff --git a/oslo/messaging/_drivers/common.py b/oslo/messaging/_drivers/common.py index 2835d72..5043368 100644 --- a/oslo/messaging/_drivers/common.py +++ b/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__) diff --git a/oslo/messaging/_drivers/matchmaker_redis.py b/oslo/messaging/_drivers/matchmaker_redis.py index 9483915..1ca11ee 100644 --- a/oslo/messaging/_drivers/matchmaker_redis.py +++ b/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): diff --git a/oslo/messaging/rpc/client.py b/oslo/messaging/rpc/client.py index 727b416..84692d4 100644 --- a/oslo/messaging/rpc/client.py +++ b/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): diff --git a/oslo/messaging/rpc/dispatcher.py b/oslo/messaging/rpc/dispatcher.py index 93d2300..e876ee0 100644 --- a/oslo/messaging/rpc/dispatcher.py +++ b/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." diff --git a/oslo/messaging/server.py b/oslo/messaging/server.py index b95f288..68559a9 100644 --- a/oslo/messaging/server.py +++ b/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.""" |