summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-17 10:28:36 +0100
committerErik Johnston <erik@matrix.org>2015-09-17 10:28:36 +0100
commitb105996fc16ac264457c5a9f8e00c6a8263142d6 (patch)
treeed9c40a01be26bc01caca12950b8c271c5b807e1 /synapse
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-b105996fc16ac264457c5a9f8e00c6a8263142d6.tar.xz
Remove run_on_reactor
Diffstat (limited to 'synapse')
-rw-r--r--synapse/state.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 1fe4d066bd..ed36f844cb 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -17,7 +17,6 @@
 from twisted.internet import defer
 
 from synapse.util.logutils import log_function
-from synapse.util.async import run_on_reactor
 from synapse.util.caches.expiringcache import ExpiringCache
 from synapse.api.constants import EventTypes
 from synapse.api.errors import AuthError
@@ -119,8 +118,6 @@ class StateHandler(object):
         Returns:
             an EventContext
         """
-        yield run_on_reactor()
-
         context = EventContext()
 
         if outlier: