Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Additional functionality for declaring worker types in Complement #14921

Merged
merged 33 commits into from
Mar 14, 2023
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4647d59
Allow for a multipler to be added to a requested worker.
realtyem Jan 23, 2023
e29ef6f
Allow for worker types to be merged and given a name.
realtyem Jan 25, 2023
8538cb6
Install examples in start_for_complement.sh.
realtyem Jan 25, 2023
02178ce
Merge branch 'develop' into comp-worker-shorthand
realtyem Jan 25, 2023
bd6b73e
Caught a typo
realtyem Jan 26, 2023
c858d45
Changelog
realtyem Jan 26, 2023
e00989f
Merge branch 'develop' into comp-worker-shorthand
realtyem Jan 26, 2023
497f01d
Merge branch 'develop' into comp-worker-shorthand
realtyem Feb 5, 2023
beb2531
Merge branch 'develop' into comp-worker-shorthand
realtyem Feb 14, 2023
8d1b37a
Apply changes from review:
realtyem Feb 19, 2023
f964a1a
Merge branch 'develop' into comp-worker-shorthand
realtyem Feb 19, 2023
aba5585
Fix conditional and update error message and comments.
realtyem Feb 19, 2023
3a7df06
Merge branch 'develop' into comp-worker-shorthand
realtyem Feb 24, 2023
47a965f
Apply changes from review.
realtyem Mar 3, 2023
5dc3318
Merge branch 'develop' into comp-worker-shorthand
realtyem Mar 3, 2023
dd9773c
Change function name and fix docstring to be correct.
realtyem Mar 5, 2023
4442c0a
Disambiguate a confusing mess of 'worker_roles', 'workers_roles', 'wo…
realtyem Mar 5, 2023
98da503
Merge branch 'develop' into comp-worker-shorthand
realtyem Mar 5, 2023
b8741d7
Update comments and a few other texty bits:
realtyem Mar 8, 2023
204f61e
Update how worker_type specific options are merged into shared_config…
realtyem Mar 8, 2023
7c32bdb
Remove condition based on number of ports
realtyem Mar 8, 2023
0cf5e80
Merge branch 'develop' into comp-worker-shorthand
realtyem Mar 8, 2023
e2fecab
Try and apply review comments about sanitizing names.
realtyem Mar 9, 2023
97a0af0
Move final creation of a worker name to after the final check of why …
realtyem Mar 9, 2023
9f3f9ab
Fix log message and the condition it fires on to reflect it only happ…
realtyem Mar 9, 2023
65de783
Try to simplify parse_worker_types
reivilibre Mar 9, 2023
aeefc5d
Try to simplify the nginx generation code
reivilibre Mar 9, 2023
b5a66b4
Move the worker type error checking upfront
reivilibre Mar 9, 2023
54c23c9
Merge branch 'fork_comp-worker-shorthand' into comp-worker-shorthand
realtyem Mar 10, 2023
32c04bb
Remove unnecessary comment.
realtyem Mar 10, 2023
78a43c8
Tweak regex to not allow final character to be a number, and adjust w…
realtyem Mar 10, 2023
8ff80d7
Update comment
realtyem Mar 10, 2023
6b90ccb
Merge branch 'develop' into comp-worker-shorthand
realtyem Mar 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/14921.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add additional functionality to declaring worker types when starting Complement in worker mode.
6 changes: 3 additions & 3 deletions docker/complement/conf/start_for_complement.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ if [[ -n "$SYNAPSE_COMPLEMENT_USE_WORKERS" ]]; then
# -z True if the length of string is zero.
if [[ -z "$SYNAPSE_WORKER_TYPES" ]]; then
export SYNAPSE_WORKER_TYPES="\
event_persister, \
event_persister, \
event_persister:2, \
background_worker, \
frontend_proxy, \
event_creator, \
Expand All @@ -64,7 +63,8 @@ if [[ -n "$SYNAPSE_COMPLEMENT_USE_WORKERS" ]]; then
synchrotron, \
client_reader, \
appservice, \
pusher"
pusher, \
stream_writers=account_data+presence+receipts+to_device+typing"

fi
log "Workers requested: $SYNAPSE_WORKER_TYPES"
Expand Down
Loading