diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-06-01 10:56:05 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-06-01 10:56:05 +0100 |
| commit | b8d49be5a1d8719ec47a44547d043874c8bfaddc (patch) | |
| tree | 52e58244f968f10176f8624eac19452d3337f810 /synapse/app | |
| parent | Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ... (diff) | |
| parent | Merge pull request #172 from intelfx/contrib-systemd (diff) | |
| download | synapse-b8d49be5a1d8719ec47a44547d043874c8bfaddc.tar.xz | |
Merge branch 'develop' into markjh/twisted-15
Conflicts: synapse/python_dependencies.py
Diffstat (limited to '')
| -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: |