summary refs log tree commit diff
path: root/synapse/handlers/register.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-03-19 11:38:59 +0000
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-03-19 11:38:59 +0000
commit88f0675967d629ed14ae6ea6d4815bd0b5e0a44e (patch)
tree1c7449b3fdb5101d1823c07fb65bdcf54421d6ab /synapse/handlers/register.py
parentFix user directory background update (#4887) (diff)
downloadsynapse-88f0675967d629ed14ae6ea6d4815bd0b5e0a44e.tar.xz
fix test_auto_create_auto_join_where_no_consent (#4886)
Diffstat (limited to 'synapse/handlers/register.py')
-rw-r--r--synapse/handlers/register.py5
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)