diff options
author | Erik Johnston <erik@matrix.org> | 2015-05-29 14:58:56 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-05-29 14:58:56 +0100 |
commit | 45bac68064754117f371e93169e332115201aee7 (patch) | |
tree | 3af9696ad2f57e13f2c876e9a41b7c18f75437f1 /synapse/config/server.py | |
parent | SYN-395: Fix CAPTCHA, don't double decode json (diff) | |
parent | Bump syutil version (diff) | |
download | synapse-45bac68064754117f371e93169e332115201aee7.tar.xz |
Merge pull request #169 from matrix-org/erikj/ultrajson
Use ultrajson when possible. Add option to turn off freezing of events.
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r-- | synapse/config/server.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 78195b3a4f..48a26c65d9 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -28,6 +28,7 @@ class ServerConfig(Config): self.web_client = config["web_client"] self.soft_file_limit = config["soft_file_limit"] self.daemonize = config.get("daemonize") + self.use_frozen_dicts = config.get("use_frozen_dicts", True) # Attempt to guess the content_addr for the v0 content repostitory content_addr = config.get("content_addr") |