diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-16 15:35:42 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-16 15:35:42 +0000 |
| commit | e15b1fd55ceb96999971dc170e1870f29f0af5c0 (patch) | |
| tree | 5e7d2d8d30e01f09d2ddfd7e546dccaf6a0e3ef7 /synapse/federation | |
| parent | Merge pull request #6274 from matrix-org/erikj/replication_async (diff) | |
| parent | Merge pull request #6280 from matrix-org/erikj/receipts_async_await (diff) | |
| download | synapse-e15b1fd55ceb96999971dc170e1870f29f0af5c0.tar.xz | |
Merge pull request #6280 from matrix-org/erikj/receipts_async_await
* commit '770d1ef67': Newsfile 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 |