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.
This commit is contained in:
Mike Bonnet
2017-09-15 22:58:09 +00:00
committed by Ralph Bean
parent 2a3aea9c97
commit 1f077a12ea

View File

@@ -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))