summary refs log tree commit diff
path: root/synapse/storage/events.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-07-05 10:29:32 +0100
committerErik Johnston <erik@matrix.org>2018-07-05 10:29:32 +0100
commite2a4b7681e865d120b04d452dfe6da923dce6fbd (patch)
tree66aa5bfb484a59a7d5a5d3ebc3f3c3e7cee150eb /synapse/storage/events.py
parentMerge pull request #3476 from matrix-org/erikj/timeout_memberships (diff)
parentMerge pull request #3483 from matrix-org/rav/more_server_name_validation (diff)
downloadsynapse-e2a4b7681e865d120b04d452dfe6da923dce6fbd.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/events.py')
-rw-r--r--synapse/storage/events.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py

index d816d4883c..a54abb9edd 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py
@@ -801,7 +801,8 @@ class EventsStore(EventsWorkerStore): ] ) - self._curr_state_delta_stream_cache.entity_has_changed( + txn.call_after( + self._curr_state_delta_stream_cache.entity_has_changed, room_id, max_stream_order, )