diff options
| author | Erik Johnston <erik@matrix.org> | 2016-03-30 12:36:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-03-30 12:36:40 +0100 |
| commit | 5fbdf2bcec40bf2f24fc0698440ee384595ff027 (patch) | |
| tree | de838c7f39544ba52cd94a429bb65d7222a4a7cb /synapse/streams/events.py | |
| parent | Merge pull request #672 from nikriek/new-author (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-5fbdf2bcec40bf2f24fc0698440ee384595ff027.tar.xz | |
Merge branch 'release-v0.14.0' of github.com:matrix-org/synapse v0.14.0
Diffstat (limited to 'synapse/streams/events.py')
| -rw-r--r-- | synapse/streams/events.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/streams/events.py b/synapse/streams/events.py index 5ddf4e988b..d4c0bb6732 100644 --- a/synapse/streams/events.py +++ b/synapse/streams/events.py @@ -38,9 +38,12 @@ class EventSources(object): name: cls(hs) for name, cls in EventSources.SOURCE_TYPES.items() } + self.store = hs.get_datastore() @defer.inlineCallbacks def get_current_token(self, direction='f'): + push_rules_key, _ = self.store.get_push_rules_stream_token() + token = StreamToken( room_key=( yield self.sources["room"].get_current_key(direction) @@ -57,5 +60,6 @@ class EventSources(object): account_data_key=( yield self.sources["account_data"].get_current_key() ), + push_rules_key=push_rules_key, ) defer.returnValue(token) |