summary refs log tree commit diff
path: root/synapse/storage/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-11-09 18:51:27 +0000
committerRichard van der Hoff <richard@matrix.org>2017-11-13 10:46:07 +0000
commit6cfee09be9b5f58b83ef30bb35fa70453c7c2329 (patch)
tree2042b72b3fc313291caab46fc3236cb19107b05e /synapse/storage/__init__.py
parentRevert "move _state_group_cache to statestore" (diff)
downloadsynapse-6cfee09be9b5f58b83ef30bb35fa70453c7c2329.tar.xz
Make __init__ consitstent across Store heirarchy
Add db_conn parameters to the `__init__` methods of the *Store classes, so that
they are all consistent, which makes the multiple inheritance work correctly
(and so that we can later extract mixins which can be used in the slavedstores)
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r--synapse/storage/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 594566eb38..d01d46338a 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -268,7 +268,7 @@ class DataStore(RoomMemberStore, RoomStore,
         self._stream_order_on_start = self.get_room_max_stream_ordering()
         self._min_stream_order_on_start = self.get_room_min_stream_ordering()
 
-        super(DataStore, self).__init__(hs)
+        super(DataStore, self).__init__(db_conn, hs)
 
     def take_presence_startup_info(self):
         active_on_startup = self._presence_on_startup