diff options
| author | Erik Johnston <erik@matrix.org> | 2020-03-02 16:55:55 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-03-02 16:55:55 +0000 |
| commit | 65a941d1f8e4a27c56ad015369219a2e7c577a01 (patch) | |
| tree | 442d9e11867521f021b3cb05531af9c446d7c4ef /synapse/storage | |
| parent | Fix worker handling (diff) | |
| parent | Always return a deferred from `get_current_state_deltas`. (#7019) (diff) | |
| download | synapse-65a941d1f8e4a27c56ad015369219a2e7c577a01.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_devices_stream
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/data_stores/main/state_deltas.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/data_stores/main/state_deltas.py b/synapse/storage/data_stores/main/state_deltas.py index 12c982cb26..725e12507f 100644 --- a/synapse/storage/data_stores/main/state_deltas.py +++ b/synapse/storage/data_stores/main/state_deltas.py @@ -15,6 +15,8 @@ import logging +from twisted.internet import defer + from synapse.storage._base import SQLBaseStore logger = logging.getLogger(__name__) @@ -56,7 +58,7 @@ class StateDeltasStore(SQLBaseStore): # if the CSDs haven't changed between prev_stream_id and now, we # know for certain that they haven't changed between prev_stream_id and # max_stream_id. - return max_stream_id, [] + return defer.succeed((max_stream_id, [])) def get_current_state_deltas_txn(txn): # First we calculate the max stream id that will give us less than |