summary refs log tree commit diff
path: root/synapse/app/generic_worker.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-10-14 13:32:07 +0100
committerErik Johnston <erik@matrix.org>2020-10-14 13:32:07 +0100
commit9250ee86508a2ee4e637b3d2dc2b3a897042c4ca (patch)
tree4bd9fa0aef27f70c509b44febf2d461dab0ffa3f /synapse/app/generic_worker.py
parentRevert "block membership events from spammy freenode bridge" (diff)
parentFix not sending events over federation when using sharded event persisters (#... (diff)
downloadsynapse-9250ee86508a2ee4e637b3d2dc2b3a897042c4ca.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/app/generic_worker.py')
-rw-r--r--synapse/app/generic_worker.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py

index d53181deb1..1b511890aa 100644 --- a/synapse/app/generic_worker.py +++ b/synapse/app/generic_worker.py
@@ -790,10 +790,6 @@ class FederationSenderHandler: send_queue.process_rows_for_federation(self.federation_sender, rows) await self.update_token(token) - # We also need to poke the federation sender when new events happen - elif stream_name == "events": - self.federation_sender.notify_new_events(token) - # ... and when new receipts happen elif stream_name == ReceiptsStream.NAME: await self._on_new_receipts(rows)