summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-01-20 14:01:36 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-01-20 14:05:29 +0000
commit198d52da3a10769b74fcec718ed9855e979f2786 (patch)
tree4b0445773cdcbb4c58f91ea1f30ab5f56ed09290 /synapse
parentAdd more logging around message retention policies support (#6717) (diff)
downloadsynapse-198d52da3a10769b74fcec718ed9855e979f2786.tar.xz
Fix empty account_validity config block
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/registration.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index b873995a49..9bb3beedbc 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -29,6 +29,7 @@ class AccountValidityConfig(Config):
     def __init__(self, config, synapse_config):
         if config is None:
             return
+        super(AccountValidityConfig, self).__init__()
         self.enabled = config.get("enabled", False)
         self.renew_by_email_enabled = "renew_at" in config
 
@@ -93,7 +94,7 @@ class RegistrationConfig(Config):
             )
 
         self.account_validity = AccountValidityConfig(
-            config.get("account_validity", {}), config
+            config.get("account_validity") or {}, config
         )
 
         self.registrations_require_3pid = config.get("registrations_require_3pid", [])