Skip to content
Snippets Groups Projects
Commit 37e07c0c authored by Ravi Tripathi's avatar Ravi Tripathi
Browse files

Changes in this commit:

* Create routing key based on 'queuename' rather then 'username'
parent 23e2e06d
No related branches found
No related tags found
3 merge requests!147Merge previous default branch feat-cod-rmq into main,!94WIP: Merge feat_prod_rmq with feat_cod_rmq,!92Feat use queuename attribute cleanup (only functional code changes)
......@@ -55,10 +55,9 @@ def dir_verify(ch, method, properties, body):
logger.error('', exc_info=True)
# send confirm message
rc_rmq.publish_msg({
'routing_key': 'confirm.' + username,
'msg': msg
})
rc_rmq.publish_msg(
{"routing_key": "confirm." + msg["queuename"], "msg": msg}
)
logger.debug(f'User {username} confirmation sent')
......
......@@ -82,12 +82,12 @@ def resolve_uid_gid(ch, method, properties, body):
ch.basic_ack(delivery_tag=method.delivery_tag)
# Send confirm message
logger.debug('rc_rmq.publish_msg()')
rc_rmq.publish_msg({
'routing_key': 'confirm.' + username,
'msg': msg
})
logger.info('confirmation sent')
logger.debug("rc_rmq.publish_msg()")
rc_rmq.publish_msg(
{"routing_key": "confirm." + msg["queuename"], "msg": msg}
)
logger.info("confirmation sent")
logger.info("Start listening to queue: {}".format(task))
rc_rmq.start_consume({
......
......@@ -80,12 +80,11 @@ def git_commit(ch, method, properties, body):
logger.error('', exc_info=True)
# Send confirm message
logger.debug('rc_rmq.publish_msge()')
rc_rmq.publish_msg({
'routing_key': 'confirm.' + username,
'msg': msg
})
logger.info('confirmation sent')
logger.debug("rc_rmq.publish_msge()")
rc_rmq.publish_msg(
{"routing_key": "confirm." + msg["queuename"], "msg": msg}
)
logger.info("confirmation sent")
# Acknowledge message
logger.debug('ch.basic_ack()')
......
......@@ -81,10 +81,9 @@ def notify_user(ch, method, properties, body):
msg['errmsg'] = errmsg if errmsg else 'Unexpected error'
# Send confirm message
rc_rmq.publish_msg({
'routing_key': 'confirm.' + username,
'msg': msg
})
rc_rmq.publish_msg(
{"routing_key": "confirm." + msg["queuename"], "msg": msg}
)
logger.debug(f'User {username} confirmation sent')
......
......@@ -66,12 +66,12 @@ def mail_list_subscription(ch, method, properties, body):
ch.basic_ack(delivery_tag=method.delivery_tag)
# send confirm message
logger.debug('rc_rmq.publish_msg()')
rc_rmq.publish_msg({
'routing_key': 'confirm.' + username,
'msg': msg
})
logger.info('confirmation sent')
logger.debug("rc_rmq.publish_msg()")
rc_rmq.publish_msg(
{"routing_key": "confirm." + msg["queuename"], "msg": msg}
)
logger.info("confirmation sent")
logger.info("Start listening to queue: {}".format(task))
rc_rmq.start_consume({
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment