diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-11-06 11:59:22 -0500 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-11-06 11:59:22 -0500 |
| commit | a5a59ab8ac6d6b244158261ee4d307d419b20180 (patch) | |
| tree | d809f7205647c13b93a103727dab6f4a19c878e4 /synapse/federation/send_queue.py | |
| parent | fix merge conflict (diff) | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-a5a59ab8ac6d6b244158261ee4d307d419b20180.tar.xz | |
Merge branch 'develop' into uhoreg/e2e_backup_hash
Diffstat (limited to 'synapse/federation/send_queue.py')
| -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 |