diff options
author | Erik Johnston <erik@matrix.org> | 2019-12-11 17:01:41 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-12-11 17:01:41 +0000 |
commit | 6828b47c459ea15d2815fe880616aa260a546838 (patch) | |
tree | bdcc359e06bd7f7f977c976fe1d770bd708b0f55 /synapse/replication/slave/storage/groups.py | |
parent | Newsfile (diff) | |
parent | Add `include_event_in_state` to _get_state_for_room (#6521) (diff) | |
download | synapse-6828b47c459ea15d2815fe880616aa260a546838.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/initial_sync_asnyc
Diffstat (limited to 'synapse/replication/slave/storage/groups.py')
-rw-r--r-- | synapse/replication/slave/storage/groups.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/replication/slave/storage/groups.py b/synapse/replication/slave/storage/groups.py index 28a46edd28..69a4ae42f9 100644 --- a/synapse/replication/slave/storage/groups.py +++ b/synapse/replication/slave/storage/groups.py @@ -14,6 +14,7 @@ # limitations under the License. from synapse.storage import DataStore +from synapse.storage.database import Database from synapse.util.caches.stream_change_cache import StreamChangeCache from ._base import BaseSlavedStore, __func__ @@ -21,8 +22,8 @@ from ._slaved_id_tracker import SlavedIdTracker class SlavedGroupServerStore(BaseSlavedStore): - def __init__(self, db_conn, hs): - super(SlavedGroupServerStore, self).__init__(db_conn, hs) + def __init__(self, database: Database, db_conn, hs): + super(SlavedGroupServerStore, self).__init__(database, db_conn, hs) self.hs = hs |