From b3cb65a02c308b97155bf420cdd82130310ec51a Mon Sep 17 00:00:00 2001 From: Gevorg Davoian <gdavoian@mirantis.com> Date: Mon, 12 Sep 2016 22:57:01 +0300 Subject: [PATCH] [zmq] Unify delimeters This patch simply replaces all delimeters used for generating internal identifiers like redis keys or socket identities with slashes (since they are visually better for debugging than dots, hyphens or underscores, which may also occur inside topic or server names). Change-Id: I8e8e80f467404a87a2526c80c8fae6cba5880c6d --- .../_drivers/zmq_driver/zmq_address.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/oslo_messaging/_drivers/zmq_driver/zmq_address.py b/oslo_messaging/_drivers/zmq_driver/zmq_address.py index 4d45dea54..a1ca86d2f 100644 --- a/oslo_messaging/_drivers/zmq_driver/zmq_address.py +++ b/oslo_messaging/_drivers/zmq_driver/zmq_address.py @@ -32,21 +32,14 @@ def get_broker_address(conf): def prefix_str(key, listener_type): - return listener_type + "_" + key + return listener_type + "/" + key def target_to_key(target, listener_type=None): - - def prefix(key): - return prefix_str(key, listener_type) if listener_type is not None \ - 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) + key = target.topic + if target.server: + key += "/" + target.server + return prefix_str(key, listener_type) if listener_type else key def target_to_subscribe_filter(target):