diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-10-28 11:12:31 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-10-28 11:12:31 +0100 |
| commit | 490b97d3e7c89981085fcc700c6e776a7d913ac7 (patch) | |
| tree | b4282c1b24da3a1c5ef416ff77f65c39798c73b2 /synapse/app | |
| parent | Bump changelog and version (diff) | |
| parent | Merge pull request #1184 from matrix-org/paul/metrics (diff) | |
| download | synapse-490b97d3e7c89981085fcc700c6e776a7d913ac7.tar.xz | |
Merge branch 'develop' into release-v0.18.2
Diffstat (limited to 'synapse/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index f27150d411..54f35900f8 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -52,7 +52,6 @@ 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 @@ -338,7 +337,6 @@ def setup(config_options): hs.get_replication_layer().start_get_pdu_cache() register_memory_metrics(hs) - register_process_collector() reactor.callWhenRunning(start) |