summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2023-03-02 15:55:26 +0000
committerGitHub <noreply@github.com>2023-03-02 15:55:26 +0000
commitc4f4dc35cd29834870693635a791ad932caf074e (patch)
tree451ace42241742ede147fc1b523ed54e3d14ef10
parentUpdate intentional mentions (MSC3952) to depend on `exact_event_property_cont... (diff)
downloadsynapse-c4f4dc35cd29834870693635a791ad932caf074e.tar.xz
Dockerfile-workers: spell out when config isn't generated (#15186)
* Complement: Spell out when config isn't generated

* Changelog
-rw-r--r--changelog.d/15186.docker1
-rwxr-xr-xdocker/configure_workers_and_start.py6
2 files changed, 6 insertions, 1 deletions
diff --git a/changelog.d/15186.docker b/changelog.d/15186.docker
new file mode 100644
index 0000000000..5e436ff7e2
--- /dev/null
+++ b/changelog.d/15186.docker
@@ -0,0 +1 @@
+Improve startup logging in the with-workers Docker image.
diff --git a/docker/configure_workers_and_start.py b/docker/configure_workers_and_start.py
index 7f615e5066..81368069ec 100755
--- a/docker/configure_workers_and_start.py
+++ b/docker/configure_workers_and_start.py
@@ -675,17 +675,21 @@ def main(args: List[str], environ: MutableMapping[str, str]) -> None:
     if not os.path.exists(config_path):
         log("Generating 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).
     # Don't re-configure workers in this instance.
     mark_filepath = "/conf/workers_have_been_configured"
     if not os.path.exists(mark_filepath):
         # Always regenerate all other config files
+        log("Generating worker config files")
         generate_worker_files(environ, config_path, data_dir)
 
         # Mark workers as being configured
         with open(mark_filepath, "w") as f:
             f.write("")
+    else:
+        log("Worker config exists—not regenerating")
 
     # Lifted right out of start.py
     jemallocpath = "/usr/lib/%s-linux-gnu/libjemalloc.so.2" % (platform.machine(),)