diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-03 15:44:50 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-03 15:44:50 +0000 |
| commit | f594c8a2c36785c3fee5b113c97143745d1b44be (patch) | |
| tree | c471022f8b1312f481c3f08bcd01a4a2edd374ac /synapse/app | |
| parent | Add some comments (diff) | |
| parent | Merge pull request #1192 from matrix-org/erikj/postgres_gist (diff) | |
| download | synapse-github/erikj/new_profile.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/new_profile github/erikj/new_profile erikj/new_profile
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) |