openstack/oslo.messaging
Code Issues Proposed changes

Merge "[zmq] Unify delimeters"

Browse Source
This commit is contained in:
Jenkins 2016-09-21 14:53:15 +00:00 committed by Gerrit Code Review
commit 885904e9ae
1 changed files with 5 additions and 12 deletions

17
oslo_messaging/_drivers/zmq_driver/zmq_address.py

@ -32,21 +32,14 @@ def get_broker_address(conf):
def prefix_str(key, listener_type): def prefix_str(key, listener_type):
return listener_type + "_" + key return listener_type + "/" + key
def target_to_key(target, listener_type=None): def target_to_key(target, listener_type=None):
key = target.topic
def prefix(key): if target.server:
return prefix_str(key, listener_type) if listener_type is not None \ key += "/" + target.server
else key return prefix_str(key, listener_type) if listener_type else key
if target.topic and target.server:
attributes = ['topic', 'server']
key = ".".join(getattr(target, attr) for attr in attributes)
return prefix(key)
if target.topic:
return prefix(target.topic)
def target_to_subscribe_filter(target): def target_to_subscribe_filter(target):