summary refs log tree commit diff
path: root/synapse/handlers/register.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-06-14 18:27:37 +1000
committerGitHub <noreply@github.com>2018-06-14 18:27:37 +1000
commita61738b316db70a4184d5c355696e0a039e7867f (patch)
treecaca1a3ef0267aad2827f2f46755161d41f2ad5a /synapse/handlers/register.py
parentMerge pull request #3368 from matrix-org/rav/fix_federation_client_host (diff)
downloadsynapse-a61738b316db70a4184d5c355696e0a039e7867f.tar.xz
Remove run_on_reactor (#3395)
Diffstat (limited to 'synapse/handlers/register.py')
-rw-r--r--synapse/handlers/register.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py

index 7e52adda3c..e76ef5426d 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py
@@ -24,7 +24,7 @@ from synapse.api.errors import ( from synapse.http.client import CaptchaServerHttpClient from synapse import types from synapse.types import UserID, create_requester, RoomID, RoomAlias -from synapse.util.async import run_on_reactor, Linearizer +from synapse.util.async import Linearizer from synapse.util.threepids import check_3pid_allowed from ._base import BaseHandler @@ -139,7 +139,6 @@ class RegistrationHandler(BaseHandler): Raises: RegistrationError if there was a problem registering. """ - yield run_on_reactor() password_hash = None if password: password_hash = yield self.auth_handler().hash(password) @@ -431,8 +430,6 @@ class RegistrationHandler(BaseHandler): Raises: RegistrationError if there was a problem registering. """ - yield run_on_reactor() - if localpart is None: raise SynapseError(400, "Request must include user id")