summary refs log tree commit diff
path: root/synapse/config/logger.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-05-04 14:49:16 +0100
committerErik Johnston <erik@matrix.org>2021-05-04 14:49:16 +0100
commitaabc46f0f65a9ad1dd2f0d8dead21581d7500805 (patch)
treed51ec80aaa582911bb93a58d6202bf82586c5784 /synapse/config/logger.py
parentAlways report memory usage metrics when TRACK_MEMORY_USAGE is True (diff)
parentAdd port parameter to the sample config for psycopg2 args (#9911) (diff)
downloadsynapse-aabc46f0f65a9ad1dd2f0d8dead21581d7500805.tar.xz
Merge remote-tracking branch 'origin/develop' into erikj/cache_mem_size
Diffstat (limited to 'synapse/config/logger.py')
-rw-r--r--synapse/config/logger.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/logger.py b/synapse/config/logger.py
index b174e0df6d..813076dfe2 100644
--- a/synapse/config/logger.py
+++ b/synapse/config/logger.py
@@ -31,7 +31,6 @@ from twisted.logger import (
 )
 
 import synapse
-from synapse.app import _base as appbase
 from synapse.logging._structured import setup_structured_logging
 from synapse.logging.context import LoggingContextFilter
 from synapse.logging.filter import MetadataFilter
@@ -318,6 +317,8 @@ def setup_logging(
     # Perform one-time logging configuration.
     _setup_stdlib_logging(config, log_config_path, logBeginner=logBeginner)
     # Add a SIGHUP handler to reload the logging configuration, if one is available.
+    from synapse.app import _base as appbase
+
     appbase.register_sighup(_reload_logging_config, log_config_path)
 
     # Log immediately so we can grep backwards.