diff options
| author | David Baker <dave@matrix.org> | 2017-11-08 11:50:08 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-11-08 11:50:08 +0000 |
| commit | ad408beb663052bc5700015db4716583f40a4536 (patch) | |
| tree | 4b012c5d1ca5bae984b3b9e0b916d4ce97aba00d /synapse/config | |
| parent | Log if any of the old config flags are set (diff) | |
| download | synapse-ad408beb663052bc5700015db4716583f40a4536.tar.xz | |
better comments
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/push.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/config/push.py b/synapse/config/push.py index 861f5f31a7..bbfeb05d50 100644 --- a/synapse/config/push.py +++ b/synapse/config/push.py @@ -29,14 +29,17 @@ class PushConfig(Config): push_config = config.get("push", {}) self.push_include_content = push_config.get("include_content", True) + # There was a a 'redact_content' setting but mistakenly read from the + # 'email'section'. Check for the flag in the 'push' section, and log, + # but do not honour it to avoid nasty surprises when people upgrade. if push_config.get("redact_content") is not None: reactor.callWhenRunning(lambda: logger.warn( "The push.redact_content content option has never worked. " "Please set push.include_content if you want this behaviour" )) - # There was a a 'redact_content' setting but mistakenly read from the - # 'email' section: check for it and honour it, with a warning. + # Now check for the one in the 'email' section and honour it, + # with a warning. push_config = config.get("email", {}) redact_content = push_config.get("redact_content") if redact_content is not None: |