diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-08-06 17:52:34 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-08-06 17:52:34 +0100 |
| commit | bf33d5c457643c0b69ebcc26401b7f3090a09e6c (patch) | |
| tree | 6b3d230ce4085c199651d2c607f633db3abb665c | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_p... (diff) | |
| download | synapse-bf33d5c457643c0b69ebcc26401b7f3090a09e6c.tar.xz | |
Incorporate review
Diffstat (limited to '')
| -rw-r--r-- | synapse/config/server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 00fa07c225..22673be9dd 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -534,10 +534,10 @@ class ServerConfig(Config): # not included in the sample configuration file on purpose as it's a temporary # hack, so that some users can trial the new defaults without impacting every # user on the homeserver. - self.users_new_default_push_rules = ( + users_new_default_push_rules = ( config.get("users_new_default_push_rules") or [] ) - if not isinstance(self.users_new_default_push_rules, list): + if not isinstance(users_new_default_push_rules, list): raise ConfigError("'users_new_default_push_rules' must be a list") # Turn the list into a set to improve lookup speed. |