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/handlers | |
| 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/handlers')
| -rw-r--r-- | synapse/handlers/pagination.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index 176e4dfdd4..60ff896386 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -86,19 +86,22 @@ class PaginationHandler: self._event_serializer = hs.get_event_client_serializer() self._retention_default_max_lifetime = ( - hs.config.server.retention_default_max_lifetime + hs.config.retention.retention_default_max_lifetime ) self._retention_allowed_lifetime_min = ( - hs.config.server.retention_allowed_lifetime_min + hs.config.retention.retention_allowed_lifetime_min ) self._retention_allowed_lifetime_max = ( - hs.config.server.retention_allowed_lifetime_max + hs.config.retention.retention_allowed_lifetime_max ) - if hs.config.worker.run_background_tasks and hs.config.server.retention_enabled: + if ( + hs.config.worker.run_background_tasks + and hs.config.retention.retention_enabled + ): # Run the purge jobs described in the configuration file. - for job in hs.config.server.retention_purge_jobs: + for job in hs.config.retention.retention_purge_jobs: logger.info("Setting up purge job with config: %s", job) self.clock.looping_call( |