Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-11-11 11:55:00 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_postgres

Browse source
This commit is contained in:
Amber Brown 2018-08-14 20:56:23 +10:00
commit 591bf87c6a
56 changed files with 404 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/storage/client_ips.py
View file

@ -96,6 +96,11 @@ class ClientIpStore(background_updates.BackgroundUpdateStore):
self._batch_row_update[key] = (user_agent, device_id, now)
def _update_client_ips_batch(self):
# If the DB pool has already terminated, don't try updating
if not self.hs.get_db_pool().running:
return
def update():
to_update = self._batch_row_update
self._batch_row_update = {}