summary refs log tree commit diff
path: root/synapse/storage/background_updates.py
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2020-07-16 11:32:19 -0400
committerGitHub <noreply@github.com>2020-07-16 11:32:19 -0400
commitf460da6031d01b2b271ded097ed6be65fd1b24f9 (patch)
tree46e683fe3355ae429e9c4cae4b24d85086479270 /synapse/storage/background_updates.py
parentCombine nginx federation server blocks (#7823) (diff)
downloadsynapse-f460da6031d01b2b271ded097ed6be65fd1b24f9.tar.xz
Consistently use `db_to_json` to convert from database values to JSON objects. (#7849)
Diffstat (limited to 'synapse/storage/background_updates.py')
-rw-r--r--synapse/storage/background_updates.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/storage/background_updates.py b/synapse/storage/background_updates.py

index 59f3394b0a..018826ef69 100644 --- a/synapse/storage/background_updates.py +++ b/synapse/storage/background_updates.py
@@ -249,7 +249,10 @@ class BackgroundUpdater(object): retcol="progress_json", ) - progress = json.loads(progress_json) + # Avoid a circular import. + from synapse.storage._base import db_to_json + + progress = db_to_json(progress_json) time_start = self._clock.time_msec() items_updated = await update_handler(progress, batch_size)