summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-24 13:14:35 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-24 13:14:35 +0000
commit9261b5a7b996815f7deaf8b1152837fb28612f9e (patch)
tree4f2c1a3e62a2320a01e2a17beb51bea9166da3b1
parentLimit size of get_auth_chain_ids query (#6947) (diff)
parentMerge pull request #6945 from matrix-org/babolivier/fix-retention-debug-log (diff)
downloadsynapse-9261b5a7b996815f7deaf8b1152837fb28612f9e.tar.xz
Merge pull request #6945 from matrix-org/babolivier/fix-retention-debug-log
* commit '5e4a43855':
  Update changelog.d/6945.bugfix
  Changelog
  Fix log in message retention purge jobs
-rw-r--r--changelog.d/6945.bugfix1
-rw-r--r--synapse/handlers/pagination.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/6945.bugfix b/changelog.d/6945.bugfix
new file mode 100644

index 0000000000..8561be16a4 --- /dev/null +++ b/changelog.d/6945.bugfix
@@ -0,0 +1 @@ +Fix errors from logging in the purge jobs related to the message retention policies support. diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py
index caf841a643..9bf6d39668 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py
@@ -133,7 +133,7 @@ class PaginationHandler(object): include_null = False logger.info( - "[purge] Running purge job for %d < max_lifetime <= %d (include NULLs = %s)", + "[purge] Running purge job for %s < max_lifetime <= %s (include NULLs = %s)", min_ms, max_ms, include_null,