Merge remote-tracking branch 'origin/develop' into metrics

This commit is contained in:
Paul "LeoNerd" Evans 2015-03-12 16:55:25 +00:00
commit e90002ca1d

View File

@ -133,10 +133,16 @@ class Pusher(object):
) )
continue continue
if matches: if matches:
logger.info("%s matches for user %s, event %s", r['rule_id'], self.user_name, ev['event_id']) logger.info(
"%s matches for user %s, event %s",
r['rule_id'], self.user_name, ev['event_id']
)
defer.returnValue(actions) defer.returnValue(actions)
logger.info("No rules match for user %s, event %s", self.user_name, ev['event_id']) logger.info(
"No rules match for user %s, event %s",
self.user_name, ev['event_id']
)
defer.returnValue(Pusher.DEFAULT_ACTIONS) defer.returnValue(Pusher.DEFAULT_ACTIONS)
@staticmethod @staticmethod