diff options
author | Mark Haines <mjark@negativecurvature.net> | 2016-03-16 11:26:22 +0000 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2016-03-16 11:26:22 +0000 |
commit | add89a03a68c9b4471546945389235184e640726 (patch) | |
tree | bab9829607686f8b03dce2f542716ac8b418f31e /synapse/storage/__init__.py | |
parent | Merge pull request #648 from matrix-org/rav/password_reset (diff) | |
parent | Add a comment to offer a hint to an explanation for why we have a unique cons... (diff) | |
download | synapse-add89a03a68c9b4471546945389235184e640726.tar.xz |
Merge pull request #647 from matrix-org/markjh/pushers_stream
Add replication stream for pushers
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r-- | synapse/storage/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 168eb27b03..250ba536ea 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -119,12 +119,15 @@ class DataStore(RoomMemberStore, RoomStore, self._state_groups_id_gen = IdGenerator(db_conn, "state_groups", "id") self._access_tokens_id_gen = IdGenerator(db_conn, "access_tokens", "id") self._refresh_tokens_id_gen = IdGenerator(db_conn, "refresh_tokens", "id") - self._pushers_id_gen = IdGenerator(db_conn, "pushers", "id") self._push_rule_id_gen = IdGenerator(db_conn, "push_rules", "id") self._push_rules_enable_id_gen = IdGenerator(db_conn, "push_rules_enable", "id") self._push_rules_stream_id_gen = ChainedIdGenerator( self._stream_id_gen, db_conn, "push_rules_stream", "stream_id" ) + self._pushers_id_gen = StreamIdGenerator( + db_conn, "pushers", "id", + extra_tables=[("deleted_pushers", "stream_id")], + ) events_max = self._stream_id_gen.get_max_token() event_cache_prefill, min_event_val = self._get_cache_dict( |