diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-06-14 18:27:37 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-14 18:27:37 +1000 |
commit | a61738b316db70a4184d5c355696e0a039e7867f (patch) | |
tree | caca1a3ef0267aad2827f2f46755161d41f2ad5a /synapse/handlers/federation.py | |
parent | Merge pull request #3368 from matrix-org/rav/fix_federation_client_host (diff) | |
download | synapse-a61738b316db70a4184d5c355696e0a039e7867f.tar.xz |
Remove run_on_reactor (#3395)
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r-- | synapse/handlers/federation.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 495ac4c648..af94bf33bc 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -39,7 +39,7 @@ from synapse.events.validator import EventValidator from synapse.util import unwrapFirstError, logcontext from synapse.util.metrics import measure_func from synapse.util.logutils import log_function -from synapse.util.async import run_on_reactor, Linearizer +from synapse.util.async import Linearizer from synapse.util.frozenutils import unfreeze from synapse.crypto.event_signing import ( compute_event_signature, add_hashes_and_signatures, @@ -1381,8 +1381,6 @@ class FederationHandler(BaseHandler): def get_state_for_pdu(self, room_id, event_id): """Returns the state at the event. i.e. not including said event. """ - yield run_on_reactor() - state_groups = yield self.store.get_state_groups( room_id, [event_id] ) @@ -1425,8 +1423,6 @@ class FederationHandler(BaseHandler): def get_state_ids_for_pdu(self, room_id, event_id): """Returns the state at the event. i.e. not including said event. """ - yield run_on_reactor() - state_groups = yield self.store.get_state_groups_ids( room_id, [event_id] ) |