diff options
| author | Erik Johnston <erik@matrix.org> | 2019-09-25 17:22:33 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-09-25 17:22:33 +0100 |
| commit | 39b50ad42a8cf784e627959e9652589338121ccd (patch) | |
| tree | 77e1ee6c4c94cc1d6fdf642a265da5448fa917cc /synapse | |
| parent | Newsfile (diff) | |
| download | synapse-39b50ad42a8cf784e627959e9652589338121ccd.tar.xz | |
Review comments
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/config/server.py | 2 | ||||
| -rw-r--r-- | synapse/storage/background_updates.py | 5 | ||||
| -rw-r--r-- | synapse/storage/client_ips.py | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 655e7487a4..f8b7b4bef9 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -745,7 +745,7 @@ class ServerConfig(Config): # How long to track users' last seen time and IPs in the database. # - # Defaults to `28d`. Set to `null` to disable. + # Defaults to `28d`. Set to `null` to disable clearing out of old rows. # #user_ips_max_age: 14d """ diff --git a/synapse/storage/background_updates.py b/synapse/storage/background_updates.py index 3fc25cd828..30788137a8 100644 --- a/synapse/storage/background_updates.py +++ b/synapse/storage/background_updates.py @@ -148,11 +148,8 @@ class BackgroundUpdateStore(SQLBaseStore): return False - async def has_completed_background_update(self, update_name): + async def has_completed_background_update(self, update_name) -> bool: """Check if the given background update has finished running. - - Returns: - Deferred[bool] """ if self._all_done: diff --git a/synapse/storage/client_ips.py b/synapse/storage/client_ips.py index 176c812b1f..a4d40dfa1e 100644 --- a/synapse/storage/client_ips.py +++ b/synapse/storage/client_ips.py @@ -506,7 +506,7 @@ class ClientIpStore(background_updates.BackgroundUpdateStore): """Removes entries in user IPs older than the configured period. """ - if not self.user_ips_max_age: + if self.user_ips_max_age is None: # Nothing to do return |