diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-06-17 11:48:12 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-06-17 11:48:12 +0100 |
| commit | 8c75040c25495bf29f4c76ca0fcc032975210012 (patch) | |
| tree | a2fda0c2d2057830837613f5a102bc774300ce1d | |
| parent | Merge pull request #874 from matrix-org/markjh/worker_config (diff) | |
| download | synapse-8c75040c25495bf29f4c76ca0fcc032975210012.tar.xz | |
Fix setting gc thresholds in the workers
| -rw-r--r-- | synapse/app/pusher.py | 3 | ||||
| -rw-r--r-- | synapse/app/synchrotron.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py index 9ac26d52c6..4f1d18ab5f 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py @@ -43,6 +43,7 @@ from daemonize import Daemonize import sys import logging +import gc logger = logging.getLogger("synapse.app.pusher") @@ -284,7 +285,7 @@ def start(config_options): logger.info("Running") change_resource_limit(config.soft_file_limit) if config.gc_thresholds: - ps.set_threshold(config.gc_thresholds) + gc.set_threshold(*config.gc_thresholds) reactor.run() def start(): diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index 160db8637e..8cf5bbbb6d 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -56,6 +56,7 @@ from daemonize import Daemonize import sys import logging import contextlib +import gc import ujson as json logger = logging.getLogger("synapse.app.synchrotron") @@ -436,7 +437,7 @@ def start(config_options): logger.info("Running") change_resource_limit(config.soft_file_limit) if config.gc_thresholds: - ss.set_threshold(config.gc_thresholds) + gc.set_threshold(*config.gc_thresholds) reactor.run() def start(): |