summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2016-10-27 18:08:15 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2016-10-27 18:08:15 +0100
commitaac13b1f9a940f5661d5989e3045b4fc086f1e20 (patch)
treebd3a949736fc8a5e15fdfdf40be9f3a962a29efe /synapse/app/homeserver.py
parentAllow creation of a 'subspace' within a Metrics object, returning another one (diff)
downloadsynapse-aac13b1f9a940f5661d5989e3045b4fc086f1e20.tar.xz
Pass the Metrics group into the process collector instead of having it find its own one; this avoids it needing to import from synapse.metrics
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index f27150d411..6766befc4e 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -338,7 +338,7 @@ def setup(config_options):
         hs.get_replication_layer().start_get_pdu_cache()
 
         register_memory_metrics(hs)
-        register_process_collector()
+        register_process_collector(get_metrics_for("process"))
 
     reactor.callWhenRunning(start)