summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-24 13:22:47 +0100
committerErik Johnston <erik@matrix.org>2016-08-24 13:22:47 +0100
commitc20cb5160d99180f7f1d99e83e0a44f3c29ed09b (patch)
tree19e005a8ff177a3d0d6ee6eae0ea5c03e775a047 /synapse/app/homeserver.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/preserve_l... (diff)
downloadsynapse-c20cb5160d99180f7f1d99e83e0a44f3c29ed09b.tar.xz
Remove tracer
Diffstat (limited to '')
-rwxr-xr-xsynapse/app/homeserver.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py

index 4493d3b847..54f35900f8 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py
@@ -50,7 +50,7 @@ from synapse.api.urls import ( ) from synapse.config.homeserver import HomeServerConfig from synapse.crypto import context_factory -from synapse.util.logcontext import LoggingContext, logcontext_tracer +from synapse.util.logcontext import LoggingContext from synapse.metrics import register_memory_metrics, get_metrics_for from synapse.metrics.resource import MetricsResource, METRICS_PREFIX from synapse.replication.resource import ReplicationResource, REPLICATION_PREFIX @@ -449,7 +449,6 @@ def run(hs): # Uncomment to enable tracing of log context changes. # sys.settrace(logcontext_tracer) with LoggingContext("run"): - sys.settrace(logcontext_tracer) change_resource_limit(hs.config.soft_file_limit) if hs.config.gc_thresholds: gc.set_threshold(*hs.config.gc_thresholds)