OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Dockerfile-workers: spell out when config isn't generated (#15186) 

* Complement: Spell out when config isn't generated

* Changelog
pull/15189/head
David Robertson 2023-03-02 15:55:26 +00:00 committed by GitHub
parent 8ef324ea6f
commit c4f4dc35cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/15186.docker Normal file
View File

@ -0,0 +1 @@
Improve startup logging in the with-workers Docker image.

6
docker/configure_workers_and_start.py
View File

@ -675,17 +675,21 @@ def main(args: List[str], environ: MutableMapping[str, str]) -> None:
if not os.path.exists(config_path): if not os.path.exists(config_path):
log("Generating base homeserver config") log("Generating base homeserver config")
generate_base_homeserver_config() generate_base_homeserver_config()
else:
log("Base homeserver config exists—not regenerating")
# This script may be run multiple times (mostly by Complement, see note at top of file). # This script may be run multiple times (mostly by Complement, see note at top of file).
# Don't re-configure workers in this instance. # Don't re-configure workers in this instance.
mark_filepath = "/conf/workers_have_been_configured" mark_filepath = "/conf/workers_have_been_configured"
if not os.path.exists(mark_filepath): if not os.path.exists(mark_filepath):
# Always regenerate all other config files # Always regenerate all other config files
log("Generating worker config files")
generate_worker_files(environ, config_path, data_dir) generate_worker_files(environ, config_path, data_dir)
# Mark workers as being configured # Mark workers as being configured
with open(mark_filepath, "w") as f: with open(mark_filepath, "w") as f:
f.write("") f.write("")
else:
log("Worker config exists—not regenerating")
# Lifted right out of start.py # Lifted right out of start.py
jemallocpath = "/usr/lib/%s-linux-gnu/libjemalloc.so.2" % (platform.machine(),) jemallocpath = "/usr/lib/%s-linux-gnu/libjemalloc.so.2" % (platform.machine(),)