particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

protonmsg: allow users to specify router-specific topic prefixes

Browse source 
Prior to this change, Koji would always send messages with a hard-coded
topic:// prefix.

This works fine for ActiveMQ 5 and Artemis, but RabbitMQ does not
support that syntax. Instead, RabbitMQ brokers expect clients to use
topic addresses with a "/topic/" prefix.

The RFE for RabbitMQ to support "topic://" prefixes is
https://github.com/rabbitmq/rabbitmq-server/issues/2583

In the meantime, allow users to specify "topic://" or "/topic/"
explicitly in their configuration.

For backwards-compatibility, if the user chose neither "topic://" nor
"/topic/", prepend the "topic://" string, preserving the plugin's
existing behavior.

(Note: ActiveMQ 5 advertises its expected topic:// prefix in the initial
connection properties, so we could read that value dynamically, but
RabbitMQ and Artemis do not send an expected topic prefix connection
properties, so we just make the user choose explicitly here.)
This commit is contained in:
Ken Dreyer 2021-11-29 16:06:33 -05:00 • committed by Tomas Kopecek
parent dc47bcc8cc
commit dbacf1f985
4 changed files with 41 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/hub/protonmsg.py
View file

@ -74,10 +74,28 @@ class TimeoutHandler(MessagingHandler):
self.log.debug('connection to %s opened successfully', event.connection.hostname)
self.send_msgs(event)
@property
def topic_prefix(self):
"""Normalize topic_prefix value that the user configured.
RabbitMQ brokers require that topics start with "/topic/"
ActiveMQ brokers require that topics start with "topic://"
If the user specified a prefix that begins with one or the other, use
that. For backwards compatibility, if the user chose neither, prepend
"topic://".
"""
koji_topic_prefix = self.conf.get('broker', 'topic_prefix')
if koji_topic_prefix.startswith('/topic/'):
return koji_topic_prefix
if koji_topic_prefix.startswith('topic://'):
return koji_topic_prefix
return 'topic://' + koji_topic_prefix
def send_msgs(self, event):
prefix = self.conf.get('broker', 'topic_prefix')
for msg in self.msgs:
address = 'topic://' + prefix + '.' + msg['address']
# address is like "topic://koji.package.add"
address = self.topic_prefix + '.' + msg['address']
if address in self.senders:
sender = self.senders[address]
self.log.debug('retrieved cached sender for %s', address)