summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorPaul Evans <leonerd@leonerd.org.uk>2016-10-21 13:06:19 +0100
committerGitHub <noreply@github.com>2016-10-21 13:06:19 +0100
commita842fed4183f3227e52fa0682e254a7cd2df6bff (patch)
tree17326c9ff939645cb5be1f28081aaa37d8d7d235 /synapse/app/homeserver.py
parentMerge pull request #1175 from matrix-org/luke/feature-configurable-as-rate-li... (diff)
parentSplit callback metric lambda functions down onto their own lines to keep line... (diff)
downloadsynapse-a842fed4183f3227e52fa0682e254a7cd2df6bff.tar.xz
Merge pull request #1177 from matrix-org/paul/standard-metric-names
Standardise prometheus metrics
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 54f35900f8..f27150d411 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -52,6 +52,7 @@ 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
@@ -337,6 +338,7 @@ def setup(config_options):
         hs.get_replication_layer().start_get_pdu_cache()
 
         register_memory_metrics(hs)
+        register_process_collector()
 
     reactor.callWhenRunning(start)