diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-03-19 11:43:46 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-03-19 11:43:46 +0000 |
| commit | 45c4e19c74d8b3e05af221ffc5c81e04bd427fcc (patch) | |
| tree | 6a6e9743f1c6926690c6e070abec0dbc5efc0fa7 /synapse/handlers/register.py | |
| parent | Enforce hs_disabled_message correctly (diff) | |
| parent | fix test_auto_create_auto_join_where_no_consent (#4886) (diff) | |
| download | synapse-45c4e19c74d8b3e05af221ffc5c81e04bd427fcc.tar.xz | |
Merge remote-tracking branch 'origin/develop' into HEAD
Diffstat (limited to 'synapse/handlers/register.py')
| -rw-r--r-- | synapse/handlers/register.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 0ec16b1d2e..68f73d3793 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -23,6 +23,7 @@ from synapse.api.constants import LoginType from synapse.api.errors import ( AuthError, Codes, + ConsentNotGivenError, InvalidCaptchaError, LimitExceededError, RegistrationError, @@ -311,6 +312,10 @@ class RegistrationHandler(BaseHandler): ) else: yield self._join_user_to_room(fake_requester, r) + except ConsentNotGivenError as e: + # Technically not necessary to pull out this error though + # moving away from bare excepts is a good thing to do. + logger.error("Failed to join new user to %r: %r", r, e) except Exception as e: logger.error("Failed to join new user to %r: %r", r, e) |