summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-24 23:27:52 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-24 23:27:52 +0000
commit8d7c0264bca6f1c70cd9ea0f6fc3a4fa5630d4ef (patch)
tree008c697f32058419568c91139b306c926c98dd3e
parentfix edu batching hackery (diff)
downloadsynapse-8d7c0264bca6f1c70cd9ea0f6fc3a4fa5630d4ef.tar.xz
more fix edu batching hackery
-rw-r--r--synapse/federation/transaction_queue.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py

index 074dae12db..c3b77419a9 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py
@@ -484,9 +484,9 @@ class TransactionQueue(object): # if we have PDUs to send, we may as well send EDUs too. Otherwise, # we only send EDUs if their delay is up - if pending_pdus or ( - destination in self.edu_tx_time_by_dest - and self.clock.time() > self.edu_tx_time_by_dest[destination] + if destination in self.edu_tx_time_by_dest and ( + pending_pdus or + self.clock.time() > self.edu_tx_time_by_dest[destination] ): del self.edu_tx_time_by_dest[destination]