summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-07-11 10:53:22 +0100
committerGitHub <noreply@github.com>2017-07-11 10:53:22 +0100
commite2cb760dccfd80f30e23a7f5d6cb29a6e867bdbe (patch)
treea4d19ed61888c751d10b84889f410adacb434b46
parentReduce log levels in tcp replication (diff)
parentDon't compute push actions for backfilled events (diff)
downloadsynapse-e2cb760dccfd80f30e23a7f5d6cb29a6e867bdbe.tar.xz
Merge pull request #2357 from matrix-org/erikj/push
Don't compute push actions for backfilled events
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 694b820d85..b790a7c2ef 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1413,7 +1413,7 @@ class FederationHandler(BaseHandler):
             auth_events=auth_events,
         )
 
-        if not event.internal_metadata.is_outlier():
+        if not event.internal_metadata.is_outlier() and not backfilled:
             yield self.action_generator.handle_push_actions_for_event(
                 event, context
             )