Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #40 from fedora-infra/feature/fedmsg-queueing
Rely on fedmsg-provided queue.
  • Loading branch information
ralphbean committed Sep 13, 2014
2 parents c7f6275 + 0c278f0 commit c6a7714
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions fedbadges/consumers.py
Expand Up @@ -158,10 +158,8 @@ def award_badge(self, username, badge_rule, link=None):
raise

def consume(self, msg):
func = functools.partial(self.deferred_consume, msg)
moksha.hub.reactor.reactor.callLater(self.consume_delay, func)
time.sleep(self.consume_delay)

def deferred_consume(self, msg):
# Strip the moksha envelope
msg = msg['body']

Expand All @@ -173,13 +171,12 @@ def deferred_consume(self, msg):
badge_rule = None

# Award every badge as appropriate.
log.info("Received %r." % msg['topic'])
log.info("Received %s, %s" % (msg['topic'], msg['msg_id']))
for badge_rule in self.badge_rules:
try:
for recipient in badge_rule.matches(msg):
self.award_badge(recipient, badge_rule, link)
except Exception as e:
log.error("Failure in badge awarder! %r Details follow:" % e)
log.error("Considering badge: %r" % badge_rule)
log.error("Received Message: %r" % msg)
log.error(traceback.format_exc())
log.exception("Rule: %r, message: %r" % (badge_rule, msg))

log.debug("Done with %s, %s" % (msg['topic'], msg['msg_id']))

0 comments on commit c6a7714

Please sign in to comment.