summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-09 13:23:41 +0100
committerErik Johnston <erik@matrix.org>2019-09-09 13:23:41 +0100
commit80e14a8546efb9e2f9edec3b1de0a8b943351252 (patch)
tree90b97f42e227cbb06917afc8609b30a2d6384537 /synapse/config
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/censor_red... (diff)
downloadsynapse-80e14a8546efb9e2f9edec3b1de0a8b943351252.tar.xz
Handle setting retention period to 0
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 8efab924d4..aa71835dc3 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -165,7 +165,7 @@ class ServerConfig(Config):
         # How long to keep redacted events in the database in unredacted form
         # before redacting them.
         redaction_retention_period = config.get("redaction_retention_period")
-        if redaction_retention_period:
+        if redaction_retention_period is not None:
             self.redaction_retention_period = self.parse_duration(
                 redaction_retention_period
             )