summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-03-12 16:55:25 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-03-12 16:55:25 +0000
commite90002ca1d7093e0e7ae0d256b5b9099a0fb1bb4 (patch)
tree4c5c1e1f503e04e83e48284b0272357b5dd7706e /synapse
parentAppease pyflakes (diff)
parentMore sacrifices to the pep8 gods. (diff)
downloadsynapse-e90002ca1d7093e0e7ae0d256b5b9099a0fb1bb4.tar.xz
Merge remote-tracking branch 'origin/develop' into metrics
Diffstat (limited to 'synapse')
-rw-r--r--synapse/push/__init__.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py
index 5056374eb9..0727f772a5 100644
--- 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