diff options
author | Mark Haines <mjark@negativecurvature.net> | 2015-12-02 09:44:56 +0000 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2015-12-02 09:44:56 +0000 |
commit | 9fbd504b4e56aa1be6c5bb611fb97dfe9f4baa9a (patch) | |
tree | 9862b08457b47628d0b8c2c8b18afa7bf987511d /synapse/handlers/register.py | |
parent | Merge pull request #406 from matrix-org/erikj/search (diff) | |
parent | Merge branch 'develop' into markjh/distributor_facade (diff) | |
download | synapse-9fbd504b4e56aa1be6c5bb611fb97dfe9f4baa9a.tar.xz |
Merge pull request #408 from matrix-org/markjh/distributor_facade
Wrap calls to distributor.fire in appropriately named functions
Diffstat (limited to 'synapse/handlers/register.py')
-rw-r--r-- | synapse/handlers/register.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 493a087031..5166bc7b62 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -31,6 +31,10 @@ import urllib logger = logging.getLogger(__name__) +def registered_user(distributor, user): + return distributor.fire("registered_user", user) + + class RegistrationHandler(BaseHandler): def __init__(self, hs): @@ -98,7 +102,7 @@ class RegistrationHandler(BaseHandler): password_hash=password_hash ) - yield self.distributor.fire("registered_user", user) + yield registered_user(self.distributor, user) else: # autogen a random user ID attempts = 0 @@ -117,7 +121,7 @@ class RegistrationHandler(BaseHandler): token=token, password_hash=password_hash) - self.distributor.fire("registered_user", user) + yield registered_user(self.distributor, user) except SynapseError: # if user id is taken, just generate another user_id = None @@ -167,7 +171,7 @@ class RegistrationHandler(BaseHandler): token=token, password_hash="" ) - self.distributor.fire("registered_user", user) + registered_user(self.distributor, user) defer.returnValue((user_id, token)) @defer.inlineCallbacks @@ -215,7 +219,7 @@ class RegistrationHandler(BaseHandler): token=token, password_hash=None ) - yield self.distributor.fire("registered_user", user) + yield registered_user(self.distributor, user) except Exception, e: yield self.store.add_access_token_to_user(user_id, token) # Ignore Registration errors |