diff options
| author | kaiyou <pierre@jaury.eu> | 2018-02-09 00:23:19 +0100 |
|---|---|---|
| committer | kaiyou <pierre@jaury.eu> | 2018-02-09 00:23:19 +0100 |
| commit | ca70148c0569295a2b9ecdd1cd9cd85a203f20e7 (patch) | |
| tree | b3e6efce1539100c05bc40e53e7a30d7f04436bf /contrib | |
| parent | Make SYNAPSE_MACAROON_SECRET_KEY a mandatory option (diff) | |
| download | synapse-ca70148c0569295a2b9ecdd1cd9cd85a203f20e7.tar.xz | |
Fix the path to the log config file
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/docker/conf/homeserver.yaml | 2 | ||||
| -rwxr-xr-x | contrib/docker/start.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/docker/conf/homeserver.yaml b/contrib/docker/conf/homeserver.yaml index 198b8ddee7..6bc25bb45f 100644 --- a/contrib/docker/conf/homeserver.yaml +++ b/contrib/docker/conf/homeserver.yaml @@ -69,7 +69,7 @@ database: event_cache_size: "{{ SYNAPSE_EVENT_CACHE_SIZE or "10K" }}" verbose: 0 log_file: "/data/homeserver.log" -log_config: "/data/{{ SYNAPSE_SERVER_NAME }}.log.config" +log_config: "/compiled/log.config" ## Ratelimiting ## diff --git a/contrib/docker/start.py b/contrib/docker/start.py index d4c1140b1d..75c30b8ac0 100755 --- a/contrib/docker/start.py +++ b/contrib/docker/start.py @@ -49,7 +49,7 @@ else: environ["SYNAPSE_APPSERVICES"] = glob.glob("/data/appservices/*.yaml") if not os.path.exists("/compiled"): os.mkdir("/compiled") convert("/conf/homeserver.yaml", "/compiled/homeserver.yaml", environ) - convert("/conf/log.config", "/compiled/%s.log.config" % environ["SYNAPSE_SERVER_NAME"], environ) + convert("/conf/log.config", "/compiled/log.config", environ) subprocess.check_output(["chown", "-R", ownership, "/data"]) args += ["--config-path", "/compiled/homeserver.yaml"] # Generate missing keys and start synapse |