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/pusher.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/pusher.py')
| -rw-r--r-- | synapse/app/pusher.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py index 1a6f5507a9..a0e765c54f 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py @@ -36,6 +36,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 @@ -239,6 +241,8 @@ def start(config_options): setup_logging(config.worker_log_config, config.worker_log_file) + events.USE_FROZEN_DICTS = config.use_frozen_dicts + if config.start_pushers: sys.stderr.write( "\nThe pushers must be disabled in the main synapse process" |