diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-08-20 06:39:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 06:39:55 -0400 |
| commit | 76c43f086a3c5feeab1fd0f916086930d44fb1cf (patch) | |
| tree | d03c010db83df55d6ae5f403d57aad46cedf0c93 /synapse/module_api/__init__.py | |
| parent | Close the database connection we create during startup (#8131) (diff) | |
| download | synapse-76c43f086a3c5feeab1fd0f916086930d44fb1cf.tar.xz | |
Do not assume calls to runInteraction return Deferreds. (#8133)
Diffstat (limited to 'synapse/module_api/__init__.py')
| -rw-r--r-- | synapse/module_api/__init__.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/synapse/module_api/__init__.py b/synapse/module_api/__init__.py index c2fb757d9a..ae0e359a77 100644 --- a/synapse/module_api/__init__.py +++ b/synapse/module_api/__init__.py @@ -167,8 +167,10 @@ class ModuleApi(object): external_id: id on that system user_id: complete mxid that it is mapped to """ - return self._store.record_user_external_id( - auth_provider_id, remote_user_id, registered_user_id + return defer.ensureDeferred( + self._store.record_user_external_id( + auth_provider_id, remote_user_id, registered_user_id + ) ) def generate_short_term_login_token( @@ -223,7 +225,9 @@ class ModuleApi(object): Returns: Deferred[object]: result of func """ - return self._store.db_pool.runInteraction(desc, func, *args, **kwargs) + return defer.ensureDeferred( + self._store.db_pool.runInteraction(desc, func, *args, **kwargs) + ) def complete_sso_login( self, registered_user_id: str, request: SynapseRequest, client_redirect_url: str |