From e9c909775582bf7a412c792ae4ef33d0e4207a43 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 2 Mar 2017 14:17:22 -0500 Subject: [PATCH 1/2] Assign further_work either way. --- module_build_service/scheduler/consumer.py | 1 + 1 file changed, 1 insertion(+) diff --git a/module_build_service/scheduler/consumer.py b/module_build_service/scheduler/consumer.py index f5c76b29..b2f336db 100644 --- a/module_build_service/scheduler/consumer.py +++ b/module_build_service/scheduler/consumer.py @@ -197,6 +197,7 @@ class MBSConsumer(fedmsg.consumers.FedmsgConsumer): if build: further_work = handler(conf, session, msg) or [] else: + further_work = [] log.warn("There's no module associated with message ID {}" .format(msg.msg_id)) except ValidationError as e: From c57d52ee568c61a4ca3efa79edb279059a11515d Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 2 Mar 2017 14:30:05 -0500 Subject: [PATCH 2/2] Simplify this. --- module_build_service/scheduler/consumer.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/module_build_service/scheduler/consumer.py b/module_build_service/scheduler/consumer.py index b2f336db..c9ff4fb2 100644 --- a/module_build_service/scheduler/consumer.py +++ b/module_build_service/scheduler/consumer.py @@ -187,6 +187,10 @@ class MBSConsumer(fedmsg.consumers.FedmsgConsumer): log.debug("Unhandled message...") return + if not build: + log.debug("No module associated with msg {}".format(msg.msg_id)) + return + # Execute our chosen handler idx = "%s: %s, %s" % (handler.__name__, type(msg).__name__, msg.msg_id) if handler is self.NO_OP: @@ -194,12 +198,7 @@ class MBSConsumer(fedmsg.consumers.FedmsgConsumer): else: log.debug("Calling %s" % idx) try: - if build: - further_work = handler(conf, session, msg) or [] - else: - further_work = [] - log.warn("There's no module associated with message ID {}" - .format(msg.msg_id)) + further_work = handler(conf, session, msg) or [] except ValidationError as e: if build: build.transition(conf, state=models.BUILD_STATES['failed'],