summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-20 15:47:28 +0100
committerErik Johnston <erik@matrix.org>2016-07-20 16:00:21 +0100
commit66868119dc3c42c3cc6ea0b41ade81285ef1c9de (patch)
tree378ccc0aac4b2bc8aa8d872f562cf79ff416a6a5 /synapse/app/homeserver.py
parentMerge pull request #922 from matrix-org/erikj/file_api2 (diff)
downloadsynapse-66868119dc3c42c3cc6ea0b41ade81285ef1c9de.tar.xz
Add metrics for psutil derived memory usage
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 9c2dd32953..fe68ceb07c 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -51,6 +51,7 @@ from synapse.api.urls import (
 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
 from synapse.metrics.resource import MetricsResource, METRICS_PREFIX
 from synapse.replication.resource import ReplicationResource, REPLICATION_PREFIX
 from synapse.federation.transport.server import TransportLayerServer
@@ -335,6 +336,8 @@ def setup(config_options):
         hs.get_datastore().start_doing_background_updates()
         hs.get_replication_layer().start_get_pdu_cache()
 
+        register_memory_metrics(hs)
+
     reactor.callWhenRunning(start)
 
     return hs