diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-09-19 15:05:31 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-09-19 15:05:31 +0100 |
| commit | b789c7eb03aaadee8d5e2f289a4c100fc01f71b8 (patch) | |
| tree | da9216150b667cd83fbc416b2431671fb5215d86 /synapse/app/client_reader.py | |
| parent | Add changelog (diff) | |
| parent | fix sample config (diff) | |
| download | synapse-b789c7eb03aaadee8d5e2f289a4c100fc01f71b8.tar.xz | |
Merge branch 'develop' into rav/saml_config_cleanup
Diffstat (limited to 'synapse/app/client_reader.py')
| -rw-r--r-- | synapse/app/client_reader.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py index 721bb5b119..dbcc414c42 100644 --- a/synapse/app/client_reader.py +++ b/synapse/app/client_reader.py @@ -119,7 +119,7 @@ class ClientReaderServer(HomeServer): KeyChangesServlet(self).register(resource) VoipRestServlet(self).register(resource) PushRuleRestServlet(self).register(resource) - VersionsRestServlet().register(resource) + VersionsRestServlet(self).register(resource) resources.update({"/_matrix/client": resource}) @@ -179,8 +179,6 @@ def start(config_options): assert config.worker_app == "synapse.app.client_reader" - setup_logging(config, use_worker_options=True) - events.USE_FROZEN_DICTS = config.use_frozen_dicts database_engine = create_engine(config.database_config) @@ -193,6 +191,8 @@ def start(config_options): database_engine=database_engine, ) + setup_logging(ss, config, use_worker_options=True) + ss.setup() reactor.addSystemEventTrigger( "before", "startup", _base.start, ss, config.worker_listeners |