Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips_2

This commit is contained in:
Erik Johnston 2019-09-25 17:53:13 +01:00
commit 4fb3c129aa
42 changed files with 1318 additions and 496 deletions

View file

@ -238,7 +238,7 @@ class BackgroundUpdateStore(SQLBaseStore):
duration_ms = time_stop - time_start
logger.info(
"Updating %r. Updated %r items in %rms."
"Running background update %r. Processed %r items in %rms."
" (total_rate=%r/ms, current_rate=%r/ms, total_updated=%r, batch_size=%r)",
update_name,
items_updated,