mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 01:00:54 +00:00
Log if any of the old config flags are set
This commit is contained in:
parent
2a98ba0ed3
commit
1b870937ae
1 changed files with 24 additions and 2 deletions
|
@ -16,14 +16,36 @@
|
|||
|
||||
from ._base import Config
|
||||
|
||||
import logging
|
||||
|
||||
from twisted.internet import reactor
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class PushConfig(Config):
|
||||
def read_config(self, config):
|
||||
self.push_include_content = True
|
||||
|
||||
push_config = config.get("push", {})
|
||||
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):
|
||||
return """
|
||||
# Clients requesting push notifications can either have the body of
|
||||
|
|
Loading…
Reference in a new issue