summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2016-10-27 18:09:34 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2016-10-27 18:09:34 +0100
commit1cc22da6002bc12b11e2e9455143c9f16ed0f5c4 (patch)
treeb6ae0b9fb42815290f727f98db841d82a04edaf0 /synapse/app
parentPass the Metrics group into the process collector instead of having it find i... (diff)
downloadsynapse-1cc22da6002bc12b11e2e9455143c9f16ed0f5c4.tar.xz
Set up the process collector during metrics __init__; that way all split-process workers have it
Diffstat (limited to 'synapse/app')
-rwxr-xr-xsynapse/app/homeserver.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 6766befc4e..54f35900f8 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -52,7 +52,6 @@ from synapse.config.homeserver import HomeServerConfig
 from synapse.crypto import context_factory
 from synapse.util.logcontext import LoggingContext
 from synapse.metrics import register_memory_metrics, get_metrics_for
-from synapse.metrics.process_collector import register_process_collector
 from synapse.metrics.resource import MetricsResource, METRICS_PREFIX
 from synapse.replication.resource import ReplicationResource, REPLICATION_PREFIX
 from synapse.federation.transport.server import TransportLayerServer
@@ -338,7 +337,6 @@ def setup(config_options):
         hs.get_replication_layer().start_get_pdu_cache()
 
         register_memory_metrics(hs)
-        register_process_collector(get_metrics_for("process"))
 
     reactor.callWhenRunning(start)