modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-06-14 22:17:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rida.messaging: few changes:

Browse Source 
- pass over conf as param (helps amq implementation)
- modname -> service to be less fedmsg centric

Signed-off-by: Lubos Kocman <lkocman@redhat.com>
This commit is contained in:
Lubos Kocman
2016-09-26 14:12:39 +02:00
parent 2f2688dc01
commit 0787abd1b5
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rida/messaging.py
View File

@@ -162,20 +162,20 @@ class RidaModule(BaseMessage):
self.module_build_state = module_build_state self.module_build_state = module_build_state
def publish(topic, msg, conf, modname='rida'): def publish(topic, msg, conf, service='rida'):
""" """
Publish a single message to a given backend, and return Publish a single message to a given backend, and return
:param topic: the topic of the message (e.g. module.state.change) :param topic: the topic of the message (e.g. module.state.change)
:param msg: the message contents of the message (typically JSON) :param msg: the message contents of the message (typically JSON)
:param conf: a Config object from the class in config.py :param conf: a Config object from the class in config.py
:param modname: the system that is publishing the message (e.g. rida) :param service: the system that is publishing the message (e.g. rida)
:return: :return:
""" """
try: try:
handler = _messaging_backends[conf.messaging]['publish'] handler = _messaging_backends[conf.messaging]['publish']
except KeyError: except KeyError:
raise KeyError("No messaging backend found for %r" % conf.messaging) raise KeyError("No messaging backend found for %r" % conf.messaging)
return handler(topic, msg, modname=modname) return handler(topic, msg, service=service)
def listen(conf, **kwargs): def listen(conf, **kwargs):
@@ -190,16 +190,15 @@ def listen(conf, **kwargs):
except KeyError: except KeyError:
raise KeyError("No messaging backend found for %r" % conf.messaging) raise KeyError("No messaging backend found for %r" % conf.messaging)
for event in handler(**kwargs): for event in handler(conf, **kwargs):
yield event yield event
def _fedmsg_publish(topic, msg, modname): def _fedmsg_publish(conf, topic, msg, service):
import fedmsg import fedmsg
return fedmsg.publish(topic=topic, msg=msg, modname=modname) return fedmsg.publish(topic, msg=msg, modname=service)
def _fedmsg_listen(conf, **kwargs): # XXX: should we keep conf?
def _fedmsg_listen(**kwargs):
""" """
Parses a fedmsg event and constructs it into the appropriate message object Parses a fedmsg event and constructs it into the appropriate message object
""" """