diff options
| author | Paul Evans <leonerd@leonerd.org.uk> | 2016-10-27 18:27:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-27 18:27:36 +0100 |
| commit | f9d5b60a2422ed4b7e66d456537c5f0bce51f382 (patch) | |
| tree | b6ae0b9fb42815290f727f98db841d82a04edaf0 /synapse/app/homeserver.py | |
| parent | Merge pull request #1183 from matrix-org/erikj/fix_email_update (diff) | |
| parent | Set up the process collector during metrics __init__; that way all split-proc... (diff) | |
| download | synapse-f9d5b60a2422ed4b7e66d456537c5f0bce51f382.tar.xz | |
Merge pull request #1184 from matrix-org/paul/metrics
Bugfix for process-wide metric export on split processes
Diffstat (limited to 'synapse/app/homeserver.py')
| -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) |