modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-13 16:29:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

messaging: amq PEP improvements

Browse Source
This commit is contained in:
Lubos Kocman
2016-10-04 15:05:09 +02:00
parent 452aba0373
commit 151d4ebadb
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rida/messaging.py
View File

@@ -72,11 +72,11 @@ class BaseMessage(object):
if service == 'koji':
content = json.loads(msg.body, encoding='utf8')['content']
log.debug("Found koji related msg: %s" % msg)
method = content['info']['method']
msg_type = content['info']['type']
method = content['info']['method']
msg_type = content['info']['type']
if method == 'newRepo':
attr = content['attribute']
attr = content['attribute']
state = content['info']['new']
if attr == "state" and state == "CLOSED":
repo_tag = content['info']['request']
@@ -106,7 +106,7 @@ class BaseMessage(object):
log.debug("Found rida related msg: %s" % msg)
body = json.loads(msg.body, encoding='utf8')
if topic == 'module.state.change':
msg_obj = RidaModule(
msg_obj = RidaModule(
msg.id, body['id'], body['state'] )
if msg_obj:
@@ -142,7 +142,7 @@ class BaseMessage(object):
# If there isn't a msg dict in msg then this message can be skipped
if not msg_inner_msg:
log.debug(('Skipping message without any content with the '
'topic "{0}"').format(topic))
'topic "{0}"').format(topic))
return None
msg_obj = None
@@ -262,7 +262,7 @@ def _fedmsg_publish(topic, msg, conf, service):
import fedmsg
return fedmsg.publish(topic, msg=msg, modname=service)
def _fedmsg_listen(conf, **kwargs): # XXX: should we keep conf?
def _fedmsg_listen(conf, **kwargs):
"""
Parses a fedmsg event and constructs it into the appropriate message object
"""
@@ -293,9 +293,9 @@ def _amq_get_messenger(conf):
assert val and '://' in val, 'config.%s: value "%s" does not seem like a valid url' % (attr, val)
msngr = proton.Messenger()
msngr.certificate=conf.amq_cert_file
msngr.private_key=conf.amq_private_key_file
msngr.trusted_certificates=conf.amq_trusted_cert_file
msngr.certificate = conf.amq_cert_file
msngr.private_key = conf.amq_private_key_file
msngr.trusted_certificates = conf.amq_trusted_cert_file
msngr.start()
for url in conf.amq_recv_addresses:
msngr.subscribe(url)