diff options
| author | Erik Johnston <erikj@jki.re> | 2016-11-08 11:32:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 11:32:22 +0000 |
| commit | 34449cfc6c6ffbd279b910363bece0c3584d17ea (patch) | |
| tree | d66128895262ea569056b67163aab9ec9a1dd385 /synapse/app/pusher.py | |
| parent | Merge pull request #1198 from euank/more-ip-blacklist (diff) | |
| parent | Respect use_frozen_dicts option in workers (diff) | |
| download | synapse-34449cfc6c6ffbd279b910363bece0c3584d17ea.tar.xz | |
Merge pull request #1616 from matrix-org/erikj/worker_frozen_dict
Respect use_frozen_dicts option in workers
Diffstat (limited to '')
| -rw-r--r-- | synapse/app/pusher.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py index 1a6f5507a9..a0e765c54f 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py @@ -36,6 +36,8 @@ from synapse.util.manhole import manhole from synapse.util.rlimit import change_resource_limit from synapse.util.versionstring import get_version_string +from synapse import events + from twisted.internet import reactor, defer from twisted.web.resource import Resource @@ -239,6 +241,8 @@ def start(config_options): setup_logging(config.worker_log_config, config.worker_log_file) + events.USE_FROZEN_DICTS = config.use_frozen_dicts + if config.start_pushers: sys.stderr.write( "\nThe pushers must be disabled in the main synapse process" |