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

2015-03-12 16:55:25 +00:00 · 2015-03-12 16:55:25 +00:00 · e90002ca1d
parent 05a056a409 bbb010a30f
commit e90002ca1d
1 changed files with 8 additions and 2 deletions
--- a/synapse/push/init.py
+++ b/synapse/push/init.py
@ -133,10 +133,16 @@ class Pusher(object):
                )
                continue
            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)

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

    @staticmethod