summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-29 15:08:22 +0000
committerErik Johnston <erik@matrix.org>2019-10-29 15:08:22 +0000
commit2c35ffead257171d195f228bafd0d65b917e2165 (patch)
treef34e80db36883adfc9623079f72f847def223ae5 /synapse/federation
parentMake concurrently_execute work with async/await (diff)
downloadsynapse-2c35ffead257171d195f228bafd0d65b917e2165.tar.xz
Port receipt and read markers to async/wait
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/send_queue.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/federation/send_queue.py b/synapse/federation/send_queue.py
index 454456a52d..ced4925a98 100644
--- a/synapse/federation/send_queue.py
+++ b/synapse/federation/send_queue.py
@@ -36,6 +36,8 @@ from six import iteritems
 
 from sortedcontainers import SortedDict
 
+from twisted.internet import defer
+
 from synapse.metrics import LaterGauge
 from synapse.storage.presence import UserPresenceState
 from synapse.util.metrics import Measure
@@ -212,7 +214,7 @@ class FederationRemoteSendQueue(object):
             receipt (synapse.types.ReadReceipt):
         """
         # nothing to do here: the replication listener will handle it.
-        pass
+        return defer.succeed(None)
 
     def send_presence(self, states):
         """As per FederationSender