summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-31 13:11:04 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-31 13:11:04 +0100
commit0bc9b9e397b413ca104a3ddb6db181e7a0fb0917 (patch)
treea3f27e72c91a5d4e367cbe57f75c722b30bd2861
parentchangelog (diff)
downloadsynapse-0bc9b9e397b413ca104a3ddb6db181e7a0fb0917.tar.xz
reinstate explicit include of EventsWorkerStore
-rw-r--r--synapse/storage/events.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index dbbfe04880..a32a306495 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -34,7 +34,9 @@ from synapse.api.errors import SynapseError
 from synapse.events import EventBase  # noqa: F401
 from synapse.events.snapshot import EventContext  # noqa: F401
 from synapse.metrics.background_process_metrics import run_as_background_process
+from synapse.storage.background_updates import BackgroundUpdateStore
 from synapse.storage.event_federation import EventFederationStore
+from synapse.storage.events_worker import EventsWorkerStore
 from synapse.types import RoomStreamToken, get_domain_from_id
 from synapse.util.async import ObservableDeferred
 from synapse.util.caches.descriptors import cached, cachedInlineCallbacks
@@ -195,7 +197,7 @@ def _retry_on_integrity_error(func):
 
 # inherits from EventFederationStore so that we can call _update_backward_extremities
 # and _handle_mult_prev_events (though arguably those could both be moved in here)
-class EventsStore(EventFederationStore):
+class EventsStore(EventFederationStore, EventsWorkerStore, BackgroundUpdateStore):
     EVENT_ORIGIN_SERVER_TS_NAME = "event_origin_server_ts"
     EVENT_FIELDS_SENDER_URL_UPDATE_NAME = "event_fields_sender_url"