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/federation_reader.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 'synapse/app/federation_reader.py')
-rw-r--r-- | synapse/app/federation_reader.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/app/federation_reader.py b/synapse/app/federation_reader.py index 1f5ae1937e..b5f59a9931 100644 --- a/synapse/app/federation_reader.py +++ b/synapse/app/federation_reader.py @@ -39,6 +39,8 @@ from synapse.api.urls import FEDERATION_PREFIX from synapse.federation.transport.server import TransportLayerServer from synapse.crypto import context_factory +from synapse import events + from twisted.internet import reactor, defer from twisted.web.resource import Resource @@ -156,6 +158,8 @@ def start(config_options): setup_logging(config.worker_log_config, config.worker_log_file) + events.USE_FROZEN_DICTS = config.use_frozen_dicts + database_engine = create_engine(config.database_config) tls_server_context_factory = context_factory.ServerContextFactory(config) |