summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-06-03 11:26:33 +0100
committerMark Haines <mjark@negativecurvature.net>2016-06-03 11:26:33 +0100
commitb09f348530fb4e17b76777278e51ddfe17957cd2 (patch)
tree50fab0c9b51daff1b901c32420430397c84377d6 /synapse/storage
parentMerge pull request #823 from matrix-org/markjh/more_slaved_stores (diff)
parentAdd a slaved store for presence (diff)
downloadsynapse-b09f348530fb4e17b76777278e51ddfe17957cd2.tar.xz
Merge pull request #824 from matrix-org/markjh/slaved_presence_store
Add a slaved store for presence
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 8581796b7e..6928a213e8 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -149,7 +149,7 @@ class DataStore(RoomMemberStore, RoomStore,
             "AccountDataAndTagsChangeCache", account_max,
         )
 
-        self.__presence_on_startup = self._get_active_presence(db_conn)
+        self._presence_on_startup = self._get_active_presence(db_conn)
 
         presence_cache_prefill, min_presence_val = self._get_cache_dict(
             db_conn, "presence_stream",
@@ -190,8 +190,8 @@ class DataStore(RoomMemberStore, RoomStore,
         super(DataStore, self).__init__(hs)
 
     def take_presence_startup_info(self):
-        active_on_startup = self.__presence_on_startup
-        self.__presence_on_startup = None
+        active_on_startup = self._presence_on_startup
+        self._presence_on_startup = None
         return active_on_startup
 
     def _get_active_presence(self, db_conn):