summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-19 13:19:18 +0100
committerGitHub <noreply@github.com>2019-06-19 13:19:18 +0100
commite0be8d70164b814688261c598947979117f0aca0 (patch)
treec1fbee26a68bdc9db3e65a3886093fbff305ffc4 /synapse/federation
parentMerge pull request #5490 from matrix-org/rav/xmlsec_in_docker (diff)
parentRun as background process and fix comments (diff)
downloadsynapse-e0be8d70164b814688261c598947979117f0aca0.tar.xz
Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events
Add experimental option to reduce extremities.
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/sender/__init__.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/federation/sender/__init__.py b/synapse/federation/sender/__init__.py
index 4f0f939102..4224b29ecf 100644
--- a/synapse/federation/sender/__init__.py
+++ b/synapse/federation/sender/__init__.py
@@ -168,6 +168,9 @@ class FederationSender(object):
                     if not is_mine and send_on_behalf_of is None:
                         return
 
+                    if not event.internal_metadata.should_proactively_send():
+                        return
+
                     try:
                         # Get the state from before the event.
                         # We need to make sure that this is the state from before