diff options
author | Erik Johnston <erik@matrix.org> | 2016-11-22 10:25:23 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-11-22 10:25:23 +0000 |
commit | f9834a3d1a25d0a715718a53e10752399985e3aa (patch) | |
tree | 3d868eafb43d9646b15cd1aaee0f4093db802fd3 /synapse/app/media_repository.py | |
parent | Merge branch 'erikj/ldap3_auth' (diff) | |
parent | Bump changelog (diff) | |
download | synapse-f9834a3d1a25d0a715718a53e10752399985e3aa.tar.xz |
Merge branch 'release-v0.18.4' of github.com:matrix-org/synapse v0.18.4
Diffstat (limited to 'synapse/app/media_repository.py')
-rw-r--r-- | synapse/app/media_repository.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/app/media_repository.py b/synapse/app/media_repository.py index 6e5ec01c6c..44c19a1bef 100644 --- a/synapse/app/media_repository.py +++ b/synapse/app/media_repository.py @@ -41,6 +41,8 @@ from synapse.api.urls import ( ) from synapse.crypto import context_factory +from synapse import events + from twisted.internet import reactor, defer from twisted.web.resource import Resource @@ -162,6 +164,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) |