summary refs log tree commit diff
diff options
context:
space:
mode:
authorreivilibre <oliverw@matrix.org>2022-06-15 15:54:32 +0100
committerGitHub <noreply@github.com>2022-06-15 15:54:32 +0100
commit212be2edc17fba65e2d1ac0099346e92f2e6bc49 (patch)
tree53527f1b38280cb56698d7e253230aa292d7c784
parentCollapse Docker build commands in Complement CI runs to make the logs easier ... (diff)
downloadsynapse-212be2edc17fba65e2d1ac0099346e92f2e6bc49.tar.xz
Use updated `update_user_directory_from_worker` options in Complement tests. (#13069)
-rw-r--r--changelog.d/13069.misc1
-rwxr-xr-xdocker/configure_workers_and_start.py6
2 files changed, 4 insertions, 3 deletions
diff --git a/changelog.d/13069.misc b/changelog.d/13069.misc
new file mode 100644

index 0000000000..4102bf96b5 --- /dev/null +++ b/changelog.d/13069.misc
@@ -0,0 +1 @@ +Make Complement CI logs easier to read. \ No newline at end of file diff --git a/docker/configure_workers_and_start.py b/docker/configure_workers_and_start.py
index 64697e0354..2a2c13f77a 100755 --- a/docker/configure_workers_and_start.py +++ b/docker/configure_workers_and_start.py
@@ -52,12 +52,12 @@ WORKERS_CONFIG: Dict[str, Dict[str, Any]] = { "worker_extra_conf": "", }, "user_dir": { - "app": "synapse.app.user_dir", + "app": "synapse.app.generic_worker", "listener_resources": ["client"], "endpoint_patterns": [ "^/_matrix/client/(api/v1|r0|v3|unstable)/user_directory/search$" ], - "shared_extra_conf": {"update_user_directory": False}, + "shared_extra_conf": {"update_user_directory_from_worker": "user_dir1"}, "worker_extra_conf": "", }, "media_repository": { @@ -78,7 +78,7 @@ WORKERS_CONFIG: Dict[str, Dict[str, Any]] = { "app": "synapse.app.generic_worker", "listener_resources": [], "endpoint_patterns": [], - "shared_extra_conf": {"notify_appservices_from_worker": "appservice"}, + "shared_extra_conf": {"notify_appservices_from_worker": "appservice1"}, "worker_extra_conf": "", }, "federation_sender": {