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/appservice.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/appservice.py')
-rw-r--r-- | synapse/app/appservice.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/app/appservice.py b/synapse/app/appservice.py index 4e62a84b28..dd9ee406a1 100644 --- a/synapse/app/appservice.py +++ b/synapse/app/appservice.py @@ -34,6 +34,8 @@ from synapse.util.manhole import manhole from synapse.util.rlimit import change_resource_limit from synapse.util.versionstring import get_version_string +from synapse import events + from twisted.internet import reactor, defer from twisted.web.resource import Resource @@ -151,6 +153,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) if config.notify_appservices: |