diff options
| author | Erik Johnston <erikj@jki.re> | 2016-06-17 15:33:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-17 15:33:55 +0100 |
| commit | 1c1f633b138da9e0cc9f8257434e97e94dea2b7c (patch) | |
| tree | 0356a46d36de1592d0b656bd2690f5d21389f667 | |
| parent | Merge pull request #876 from matrix-org/erikj/sign_own (diff) | |
| parent | Enable use_frozen_events in tests (diff) | |
| download | synapse-1c1f633b138da9e0cc9f8257434e97e94dea2b7c.tar.xz | |
Merge pull request #877 from matrix-org/erikj/frozen_default
Turn use_frozen_events off by default
| -rw-r--r-- | synapse/config/server.py | 2 | ||||
| -rw-r--r-- | tests/utils.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index f370b22c32..7840dc3ad6 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -27,7 +27,7 @@ class ServerConfig(Config): self.daemonize = config.get("daemonize") self.print_pidfile = config.get("print_pidfile") self.user_agent_suffix = config.get("user_agent_suffix") - self.use_frozen_dicts = config.get("use_frozen_dicts", True) + self.use_frozen_dicts = config.get("use_frozen_dicts", False) self.public_baseurl = config.get("public_baseurl") self.secondary_directory_servers = config.get("secondary_directory_servers", []) diff --git a/tests/utils.py b/tests/utils.py index e19ae581e0..6e41ae1ff6 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -54,6 +54,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs): config.trusted_third_party_id_servers = [] config.room_invite_state_types = [] + config.use_frozen_dicts = True config.database_config = {"name": "sqlite3"} if "clock" not in kargs: |