diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-03 09:25:15 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-03 09:25:15 +0100 |
| commit | cb298ff623c1ad375084f7687b7f6e546c4c1c1f (patch) | |
| tree | 81854fc4ae0a45bed487a58f2c40974b683adb92 /synapse/storage/event_federation.py | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment (diff) | |
| download | synapse-cb298ff623c1ad375084f7687b7f6e546c4c1c1f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_repl_servlet
Diffstat (limited to 'synapse/storage/event_federation.py')
| -rw-r--r-- | synapse/storage/event_federation.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py index 5d3ee90017..24345b20a6 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py @@ -25,7 +25,7 @@ from twisted.internet import defer from synapse.api.errors import StoreError from synapse.metrics.background_process_metrics import run_as_background_process from synapse.storage._base import SQLBaseStore -from synapse.storage.events import EventsWorkerStore +from synapse.storage.events_worker import EventsWorkerStore from synapse.storage.signatures import SignatureWorkerStore from synapse.util.caches.descriptors import cached @@ -343,6 +343,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, table="events", keyvalues={ "event_id": event_id, + "room_id": room_id, }, retcol="depth", allow_none=True, |