diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-30 11:44:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-30 11:44:18 +0100 |
| commit | 770d1ef6733cd2560b7bddbc6ec43ea72c95400d (patch) | |
| tree | 1707085c2d3b3a6e283b6aefb6bc35a4319a541f /synapse/federation | |
| parent | Merge pull request #6274 from matrix-org/erikj/replication_async (diff) | |
| parent | Merge branch 'erikj/federation_server_async_await' of github.com:matrix-org/s... (diff) | |
| download | synapse-770d1ef6733cd2560b7bddbc6ec43ea72c95400d.tar.xz | |
Merge pull request #6280 from matrix-org/erikj/receipts_async_await
Port receipt and read markers to async/wait
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/send_queue.py | 4 |
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 |