summary refs log tree commit diff
path: root/synapse/storage/push_rule.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-04-01 15:13:14 +0100
committerMark Haines <mjark@negativecurvature.net>2016-04-01 15:13:14 +0100
commitf2b916534bdbb5d126311a3fbe653fa9d1e4dcf0 (patch)
tree0c0edfab04b20cde74447189dd0917b454b2b030 /synapse/storage/push_rule.py
parentMerge pull request #685 from matrix-org/erikj/sync_leave (diff)
parentAssert that the step != 0 (diff)
downloadsynapse-f2b916534bdbb5d126311a3fbe653fa9d1e4dcf0.tar.xz
Merge pull request #684 from matrix-org/markjh/backfill_id_gen
Use a stream id generator for backfilled ids
Diffstat (limited to 'synapse/storage/push_rule.py')
-rw-r--r--synapse/storage/push_rule.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py

index 9dbad2fd5f..d2bf7f2aec 100644 --- a/synapse/storage/push_rule.py +++ b/synapse/storage/push_rule.py
@@ -392,7 +392,7 @@ class PushRuleStore(SQLBaseStore): """Get the position of the push rules stream. Returns a pair of a stream id for the push_rules stream and the room stream ordering it corresponds to.""" - return self._push_rules_stream_id_gen.get_max_token() + return self._push_rules_stream_id_gen.get_current_token() def have_push_rules_changed_for_user(self, user_id, last_id): if not self.push_rules_stream_cache.has_entity_changed(user_id, last_id):