summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-04-26 11:13:16 +0100
committerRichard van der Hoff <richard@matrix.org>2019-04-26 11:14:49 +0100
commitbd0d45ca69587f4f258b738dfa3a55704838081e (patch)
tree1c52064312301e9f6262089e3110f948694e49db /synapse/storage
parentMerge remote-tracking branch 'origin/master' into develop (diff)
downloadsynapse-bd0d45ca69587f4f258b738dfa3a55704838081e.tar.xz
Fix infinite loop in presence handler
Fixes #5102
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/state_deltas.py18
1 files changed, 18 insertions, 0 deletions
diff --git a/synapse/storage/state_deltas.py b/synapse/storage/state_deltas.py

index 56e42f583d..31a0279b18 100644 --- a/synapse/storage/state_deltas.py +++ b/synapse/storage/state_deltas.py
@@ -22,6 +22,24 @@ logger = logging.getLogger(__name__) class StateDeltasStore(SQLBaseStore): def get_current_state_deltas(self, prev_stream_id): + """Fetch a list of room state changes since the given stream id + + Each entry in the result contains the following fields: + - stream_id (int) + - room_id (str) + - type (str): event type + - state_key (str): + - event_id (str|None): new event_id for this state key. None if the + state has been deleted. + - prev_event_id (str|None): previous event_id for this state key. None + if it's new state. + + Args: + prev_stream_id (int): point to get changes since (exclusive) + + Returns: + Deferred[list[dict]]: results + """ prev_stream_id = int(prev_stream_id) if not self._curr_state_delta_stream_cache.has_any_entity_changed( prev_stream_id