diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-27 11:02:30 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-27 11:02:30 +0100 |
| commit | 45bdacd9a75c7e32b0b8708ae58fb9e661376bfd (patch) | |
| tree | 0118fd2870598a004d7439f67e21c8651f425643 /synapse/app | |
| parent | Fixup change log (diff) | |
| parent | Merge pull request #1098 from matrix-org/markjh/bearer_token (diff) | |
| download | synapse-45bdacd9a75c7e32b0b8708ae58fb9e661376bfd.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2
Diffstat (limited to 'synapse/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 2 |
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) |