diff options
| author | Erik Johnston <erik@matrix.org> | 2019-09-09 13:23:41 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-09-09 13:23:41 +0100 |
| commit | 80e14a8546efb9e2f9edec3b1de0a8b943351252 (patch) | |
| tree | 90b97f42e227cbb06917afc8609b30a2d6384537 /synapse | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/censor_red... (diff) | |
| download | synapse-80e14a8546efb9e2f9edec3b1de0a8b943351252.tar.xz | |
Handle setting retention period to 0
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/config/server.py | 2 | ||||
| -rw-r--r-- | synapse/storage/events.py | 2 |
2 files changed, 2 insertions, 2 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 ) diff --git a/synapse/storage/events.py b/synapse/storage/events.py index a5d13ddc49..77ba7eb2af 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -1566,7 +1566,7 @@ class EventsStore( Deferred """ - if not self.hs.config.redaction_retention_period: + if self.hs.config.redaction_retention_period is None: return max_pos = yield self.find_first_stream_ordering_after_ts( |