diff options
| author | Erik Johnston <erikj@jki.re> | 2016-07-20 16:32:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 16:32:38 +0100 |
| commit | b73dc0ef4de07a9062b858332d0a12e8805cb8b8 (patch) | |
| tree | dc9379f33f92b1a1e990b77737c6e0401b4d5a8f /synapse/app/homeserver.py | |
| parent | Merge pull request #935 from matrix-org/erikj/backfill_notifs (diff) | |
| parent | Make jenkins install deps on unit tests (diff) | |
| download | synapse-b73dc0ef4de07a9062b858332d0a12e8805cb8b8.tar.xz | |
Merge pull request #936 from matrix-org/erikj/log_rss
Add metrics for psutil derived memory usage
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 3 |
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 |