diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-10-15 10:30:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 14:30:48 +0000 |
| commit | 55731333488bfd53ece117938dde1cef710eef68 (patch) | |
| tree | 1aac455f46664ec3c65ba5358ed8b28da2949044 /synapse/storage | |
| parent | Fix logging context warnings when losing replication connection (#10984) (diff) | |
| download | synapse-55731333488bfd53ece117938dde1cef710eef68.tar.xz | |
Move experimental & retention config out of the server module. (#11070)
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/databases/main/room.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py index d69eaf80ce..835d7889cb 100644 --- a/synapse/storage/databases/main/room.py +++ b/synapse/storage/databases/main/room.py @@ -679,8 +679,8 @@ class RoomWorkerStore(SQLBaseStore): # policy. if not ret: return { - "min_lifetime": self.config.server.retention_default_min_lifetime, - "max_lifetime": self.config.server.retention_default_max_lifetime, + "min_lifetime": self.config.retention.retention_default_min_lifetime, + "max_lifetime": self.config.retention.retention_default_max_lifetime, } row = ret[0] @@ -690,10 +690,10 @@ class RoomWorkerStore(SQLBaseStore): # The default values will be None if no default policy has been defined, or if one # of the attributes is missing from the default policy. if row["min_lifetime"] is None: - row["min_lifetime"] = self.config.server.retention_default_min_lifetime + row["min_lifetime"] = self.config.retention.retention_default_min_lifetime if row["max_lifetime"] is None: - row["max_lifetime"] = self.config.server.retention_default_max_lifetime + row["max_lifetime"] = self.config.retention.retention_default_max_lifetime return row |