summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-20 13:25:06 +0100
committerErik Johnston <erik@matrix.org>2016-07-20 13:25:06 +0100
commit57dca356923f220026d31fbb58fcf37ae9b27c8e (patch)
tree84e72497d0033287f73396377508fa76a313be26
parentMerge pull request #922 from matrix-org/erikj/file_api2 (diff)
downloadsynapse-57dca356923f220026d31fbb58fcf37ae9b27c8e.tar.xz
Don't notify pusher pool for backfilled events
-rw-r--r--synapse/handlers/federation.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 7622962d46..3f138daf17 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1118,11 +1118,12 @@ class FederationHandler(BaseHandler):
             backfilled=backfilled,
         )
 
-        # this intentionally does not yield: we don't care about the result
-        # and don't need to wait for it.
-        preserve_fn(self.hs.get_pusherpool().on_new_notifications)(
-            event_stream_id, max_stream_id
-        )
+        if not backfilled:
+            # this intentionally does not yield: we don't care about the result
+            # and don't need to wait for it.
+            preserve_fn(self.hs.get_pusherpool().on_new_notifications)(
+                event_stream_id, max_stream_id
+            )
 
         defer.returnValue((context, event_stream_id, max_stream_id))