From 1f077a12ea7dbfc85e974a6b013e9b074e2845b7 Mon Sep 17 00:00:00 2001 From: Mike Bonnet Date: Fri, 15 Sep 2017 22:58:09 +0000 Subject: [PATCH] pass the entire message to get_abstracted_msg() Other messaging backends may use different formats, so pass the entire message through and let get_abstracted_msg() handle it. --- module_build_service/scheduler/consumer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module_build_service/scheduler/consumer.py b/module_build_service/scheduler/consumer.py index 67b3300a..783aeb26 100644 --- a/module_build_service/scheduler/consumer.py +++ b/module_build_service/scheduler/consumer.py @@ -131,7 +131,7 @@ class MBSConsumer(fedmsg.consumers.FedmsgConsumer): if isinstance(message, module_build_service.messaging.BaseMessage): msg = message else: - msg = self.get_abstracted_msg(message['body']) + msg = self.get_abstracted_msg(message) # Primary work is done here. try: @@ -147,10 +147,10 @@ class MBSConsumer(fedmsg.consumers.FedmsgConsumer): # Convert the message to an abstracted message if conf.messaging == 'fedmsg': msg = module_build_service.messaging.BaseMessage.from_fedmsg( - message['topic'], message) + message['body']['topic'], message['body']) elif conf.messaging == 'amq': msg = module_build_service.messaging.BaseMessage.from_amq( - message['topic'], message) + message['body']['topic'], message['body']) else: raise ValueError('The messaging format "{0}" is not supported' .format(conf.messaging))