mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 03:20:52 +00:00
better comments
This commit is contained in:
parent
1b870937ae
commit
ad408beb66
1 changed files with 5 additions and 2 deletions
|
@ -29,14 +29,17 @@ class PushConfig(Config):
|
||||||
push_config = config.get("push", {})
|
push_config = config.get("push", {})
|
||||||
self.push_include_content = push_config.get("include_content", True)
|
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:
|
if push_config.get("redact_content") is not None:
|
||||||
reactor.callWhenRunning(lambda: logger.warn(
|
reactor.callWhenRunning(lambda: logger.warn(
|
||||||
"The push.redact_content content option has never worked. "
|
"The push.redact_content content option has never worked. "
|
||||||
"Please set push.include_content if you want this behaviour"
|
"Please set push.include_content if you want this behaviour"
|
||||||
))
|
))
|
||||||
|
|
||||||
# There was a a 'redact_content' setting but mistakenly read from the
|
# Now check for the one in the 'email' section and honour it,
|
||||||
# 'email' section: check for it and honour it, with a warning.
|
# with a warning.
|
||||||
push_config = config.get("email", {})
|
push_config = config.get("email", {})
|
||||||
redact_content = push_config.get("redact_content")
|
redact_content = push_config.get("redact_content")
|
||||||
if redact_content is not None:
|
if redact_content is not None:
|
||||||
|
|
Loading…
Reference in a new issue