From 174e6573799724b4ad4e66f60870ff4874927e15 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Mon, 19 Dec 2016 09:10:36 +0100 Subject: [PATCH] MBSConsumer: Handle initial messages in right order, override validate for non-fedmsg messaging backends. --- module_build_service/scheduler/consumer.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module_build_service/scheduler/consumer.py b/module_build_service/scheduler/consumer.py index 9896b7d6..f617639e 100644 --- a/module_build_service/scheduler/consumer.py +++ b/module_build_service/scheduler/consumer.py @@ -58,7 +58,7 @@ class MBSConsumer(fedmsg.consumers.FedmsgConsumer): # Furthermore, extend our initial messages with any that were queued up # in the test environment before our hub was initialized. while module_build_service.messaging._initial_messages: - msg = module_build_service.messaging._initial_messages.pop() + msg = module_build_service.messaging._initial_messages.pop(0) self.incoming.put(msg) # These are our main lookup tables for figuring out what to run in @@ -96,6 +96,10 @@ class MBSConsumer(fedmsg.consumers.FedmsgConsumer): reactor.callFromThread(self.hub.stop) reactor.callFromThread(reactor.stop) + def validate(self, message): + if conf.messaging == 'fedmsg': + super(MBSConsumer, self).validate(message) + def consume(self, message): log.info("Received %r" % message)