diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2016-03-08 17:35:09 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2016-03-08 17:35:09 +0000 |
| commit | 3b97797c8d60bf9b6e5e09396620144ee9a8bc83 (patch) | |
| tree | 3f4d437943e53a3f4be2d6626f0585d471c0cb7f /synapse/streams/events.py | |
| parent | Idempotent-ise schema update script (diff) | |
| parent | Merge pull request #630 from matrix-org/dbkr/post_urlencoded_encode_params (diff) | |
| download | synapse-3b97797c8d60bf9b6e5e09396620144ee9a8bc83.tar.xz | |
Merge branch 'develop' into daniel/ick
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) |