summary refs log tree commit diff
path: root/synapse/metrics/background_process_metrics.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-17 10:56:55 +0100
committerErik Johnston <erik@matrix.org>2019-07-17 10:56:55 +0100
commit5299707329e1c5d6228605ca660800f6dc4cf20d (patch)
tree5277555c65670460cbd761698b1c920473d2835f /synapse/metrics/background_process_metrics.py
parentMerge remote-tracking branch 'origin/release-v1.1.0' into matrix-org-hotfixes (diff)
parentMerge pull request #5597 from matrix-org/erikj/admin_api_cmd (diff)
downloadsynapse-5299707329e1c5d6228605ca660800f6dc4cf20d.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/metrics/background_process_metrics.py')
-rw-r--r--synapse/metrics/background_process_metrics.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/metrics/background_process_metrics.py b/synapse/metrics/background_process_metrics.py

index 167e2c068a..edd6b42db3 100644 --- a/synapse/metrics/background_process_metrics.py +++ b/synapse/metrics/background_process_metrics.py
@@ -22,7 +22,7 @@ from prometheus_client.core import REGISTRY, Counter, GaugeMetricFamily from twisted.internet import defer -from synapse.util.logcontext import LoggingContext, PreserveLoggingContext +from synapse.logging.context import LoggingContext, PreserveLoggingContext logger = logging.getLogger(__name__)