summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-05-14 11:36:23 +0100
committerMark Haines <mark.haines@matrix.org>2015-05-14 11:36:23 +0100
commit243c56e725920035b3847fb504cbbaf73428e0ca (patch)
tree140dcae6cbc3c476e08032de7f3c4c6e5c324aea /synapse/storage
parentMerge branch 'develop' into notifier_unify (diff)
parentSpecify python 2.7 in the virtualenv setup (SYN-319) #resolved (diff)
downloadsynapse-243c56e725920035b3847fb504cbbaf73428e0ca.tar.xz
Merge branch 'develop' into notifier_unify
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/events.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index a5a6869079..9242b0a84e 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -48,6 +48,7 @@ class EventsStore(SQLBaseStore):
             @contextmanager
             def stream_ordering_manager():
                 yield stream_ordering
+            stream_ordering_manager = stream_ordering_manager()
 
         try:
             with stream_ordering_manager as stream_ordering: