diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-17 13:32:00 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-17 13:32:00 +0000 |
| commit | a6118f0ccfd36747a4c6957afd433436e5c5a209 (patch) | |
| tree | 2a77dc8d3ed288fca8bbce2556935f4cd70bad75 /synapse/handlers/register.py | |
| parent | Update ModuleApi to avoid register(generate_token=True) (#5640) (diff) | |
| parent | Better logging for auto-join. (#5643) (diff) | |
| download | synapse-a6118f0ccfd36747a4c6957afd433436e5c5a209.tar.xz | |
Better logging for auto-join. (#5643)
Diffstat (limited to 'synapse/handlers/register.py')
| -rw-r--r-- | synapse/handlers/register.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 88cafe8ad9..0f47153e7a 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -269,8 +269,14 @@ class RegistrationHandler(BaseHandler): user_id = None token = None attempts += 1 + if not self.hs.config.user_consent_at_registration: yield self._auto_join_rooms(user_id) + else: + logger.info( + "Skipping auto-join for %s because consent is required at registration", + user_id, + ) # Bind any specified emails to this account current_time = self.hs.get_clock().time_msec() @@ -319,6 +325,7 @@ class RegistrationHandler(BaseHandler): count = yield self.store.count_all_users() should_auto_create_rooms = count == 1 for r in self.hs.config.auto_join_rooms: + logger.info("Auto-joining %s to %s", user_id, r) try: if should_auto_create_rooms: room_alias = RoomAlias.from_string(r) |