Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-25 20:09:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Log if any of the old config flags are set

Browse Source
This commit is contained in:
David Baker 2017-11-08 11:46:24 +00:00
parent 2a98ba0ed3
commit 1b870937ae
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
synapse/config/push.py
View File

@ -16,14 +16,36 @@
from ._base import Config from ._base import Config
import logging
from twisted.internet import reactor
logger = logging.getLogger(__name__)
class PushConfig(Config): class PushConfig(Config):
def read_config(self, config): def read_config(self, config):
self.push_include_content = True
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)
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.
push_config = config.get("email", {})
redact_content = push_config.get("redact_content")
if redact_content is not None:
reactor.callWhenRunning(lambda: logger.warn(
"The 'email.redact_content' option is deprecated: "
"please set push.include_content instead"
))
self.push_include_content = not redact_content
def default_config(self, config_dir_path, server_name, **kwargs): def default_config(self, config_dir_path, server_name, **kwargs):
return """ return """
# Clients requesting push notifications can either have the body of # Clients requesting push notifications can either have the body of