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/app | |
| 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/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index f3513abb55..d93afdc1c2 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -54,6 +54,8 @@ from synapse.rest.client.v1 import ClientV1RestResource from synapse.rest.client.v2_alpha import ClientV2AlphaRestResource from synapse.metrics.resource import MetricsResource, METRICS_PREFIX +from synapse import events + from daemonize import Daemonize import twisted.manhole.telnet @@ -415,6 +417,8 @@ def setup(config_options): logger.info("Server hostname: %s", config.server_name) logger.info("Server version: %s", version_string) + events.USE_FROZEN_DICTS = config.use_frozen_dicts + if re.search(":[0-9]+$", config.server_name): domain_with_port = config.server_name else: |