openstack/neutron
Code Issues Proposed changes

Merge "Removed direct access to MessagingServer"

Browse Source
This commit is contained in:
Jenkins 2014-09-09 03:15:55 +00:00 committed by Gerrit Code Review
commit 0bc4d60025
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
neutron/common/rpc.py
View File

@ -16,9 +16,7 @@
from oslo.config import cfg from oslo.config import cfg
from oslo import messaging from oslo import messaging
from oslo.messaging.rpc import dispatcher as rpc_dispatcher
from oslo.messaging import serializer as om_serializer from oslo.messaging import serializer as om_serializer
from oslo.messaging import server as msg_server
from neutron.common import exceptions from neutron.common import exceptions
from neutron.common import log from neutron.common import log
@ -93,8 +91,8 @@ def get_client(target, version_cap=None, serializer=None):
def get_server(target, endpoints, serializer=None): def get_server(target, endpoints, serializer=None):
assert TRANSPORT is not None assert TRANSPORT is not None
serializer = RequestContextSerializer(serializer) serializer = RequestContextSerializer(serializer)
dispatcher = RPCDispatcher(target, endpoints, serializer) return messaging.get_rpc_server(TRANSPORT, target, endpoints,
return msg_server.MessageHandlingServer(TRANSPORT, dispatcher, 'eventlet') 'eventlet', serializer)
def get_notifier(service=None, host=None, publisher_id=None): def get_notifier(service=None, host=None, publisher_id=None):
@ -104,18 +102,6 @@ def get_notifier(service=None, host=None, publisher_id=None):
return NOTIFIER.prepare(publisher_id=publisher_id) return NOTIFIER.prepare(publisher_id=publisher_id)
class RPCDispatcher(rpc_dispatcher.RPCDispatcher):
def __call__(self, incoming):
# NOTE(yamahata): '***' is chosen for consistency with
# openstack.common.strutils.mask_password
sanitize_key_list = ('auth_token', )
sanitized_ctxt = dict((k, '***' if k in sanitize_key_list else v)
for (k, v) in incoming.ctxt.items())
LOG.debug('Incoming RPC: ctxt:%s message:%s', sanitized_ctxt,
incoming.message)
return super(RPCDispatcher, self).__call__(incoming)
class RequestContextSerializer(om_serializer.Serializer): class RequestContextSerializer(om_serializer.Serializer):
"""This serializer is used to convert RPC common context into """This serializer is used to convert RPC common context into
Neutron Context. Neutron Context.