summary refs log tree commit diff
path: root/synapse/streams
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-03-04 16:35:08 +0000
committerMark Haines <mjark@negativecurvature.net>2016-03-04 16:35:08 +0000
commitb7a3be693b06b325d74060df6f809580e1225acd (patch)
tree6ccd3c898749e0ea98e820c586895b66cbc626b2 /synapse/streams
parentMerge pull request #625 from matrix-org/erikj/kick_ban_sync (diff)
parentPrefill from the correct stream (diff)
downloadsynapse-b7a3be693b06b325d74060df6f809580e1225acd.tar.xz
Merge pull request #618 from matrix-org/markjh/pushrule_stream
Add a stream for push rule updates
Diffstat (limited to 'synapse/streams')
-rw-r--r--synapse/streams/events.py4
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)