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

Commit 0b06e48

Browse files
committed
Collapse WORKERS_CONFIG by removing entries with defaults
1 parent db1d3a6 commit 0b06e48

File tree

1 file changed

+2
-44
lines changed

1 file changed

+2
-44
lines changed

docker/configure_workers_and_start.py

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,7 @@ class WorkerTemplate:
9898

9999

100100
WORKERS_CONFIG: Dict[str, WorkerTemplate] = {
101-
"pusher": WorkerTemplate(
102-
listener_resources=[],
103-
endpoint_patterns=[],
104-
shared_extra_conf=lambda _worker_name: {},
105-
worker_extra_conf="",
106-
),
101+
"pusher": WorkerTemplate(),
107102
"user_dir": WorkerTemplate(
108103
listener_resources=["client"],
109104
endpoint_patterns=[
@@ -112,7 +107,6 @@ class WorkerTemplate:
112107
shared_extra_conf=lambda worker_name: {
113108
"update_user_directory_from_worker": worker_name
114109
},
115-
worker_extra_conf="",
116110
),
117111
"media_repository": WorkerTemplate(
118112
listener_resources=["media"],
@@ -132,19 +126,11 @@ class WorkerTemplate:
132126
worker_extra_conf="enable_media_repo: true",
133127
),
134128
"appservice": WorkerTemplate(
135-
listener_resources=[],
136-
endpoint_patterns=[],
137129
shared_extra_conf=lambda worker_name: {
138130
"notify_appservices_from_worker": worker_name
139131
},
140-
worker_extra_conf="",
141-
),
142-
"federation_sender": WorkerTemplate(
143-
listener_resources=[],
144-
endpoint_patterns=[],
145-
shared_extra_conf=lambda _worker_name: {},
146-
worker_extra_conf="",
147132
),
133+
"federation_sender": WorkerTemplate(),
148134
"synchrotron": WorkerTemplate(
149135
listener_resources=["client"],
150136
endpoint_patterns=[
@@ -153,8 +139,6 @@ class WorkerTemplate:
153139
"^/_matrix/client/(api/v1|r0|v3)/initialSync$",
154140
"^/_matrix/client/(api/v1|r0|v3)/rooms/[^/]+/initialSync$",
155141
],
156-
shared_extra_conf=lambda _worker_name: {},
157-
worker_extra_conf="",
158142
),
159143
"client_reader": WorkerTemplate(
160144
listener_resources=["client"],
@@ -187,8 +171,6 @@ class WorkerTemplate:
187171
"^/_matrix/client/(r0|v3|unstable)/capabilities$",
188172
"^/_matrix/client/(r0|v3|unstable)/notifications$",
189173
],
190-
shared_extra_conf=lambda _worker_name: {},
191-
worker_extra_conf="",
192174
),
193175
"federation_reader": WorkerTemplate(
194176
listener_resources=["federation"],
@@ -213,28 +195,18 @@ class WorkerTemplate:
213195
"^/_matrix/federation/(v1|v2)/get_groups_publicised$",
214196
"^/_matrix/key/v2/query",
215197
],
216-
shared_extra_conf=lambda _worker_name: {},
217-
worker_extra_conf="",
218198
),
219199
"federation_inbound": WorkerTemplate(
220200
listener_resources=["federation"],
221201
endpoint_patterns=["/_matrix/federation/(v1|v2)/send/"],
222-
shared_extra_conf=lambda _worker_name: {},
223-
worker_extra_conf="",
224202
),
225203
"event_persister": WorkerTemplate(
226204
listener_resources=["replication"],
227-
endpoint_patterns=[],
228-
shared_extra_conf=lambda _worker_name: {},
229-
worker_extra_conf="",
230205
),
231206
"background_worker": WorkerTemplate(
232-
listener_resources=[],
233-
endpoint_patterns=[],
234207
# This worker cannot be sharded. Therefore, there should only ever be one
235208
# background worker. This is enforced for the safety of your database.
236209
shared_extra_conf=lambda worker_name: {"run_background_tasks_on": worker_name},
237-
worker_extra_conf="",
238210
),
239211
"event_creator": WorkerTemplate(
240212
listener_resources=["client"],
@@ -246,50 +218,36 @@ class WorkerTemplate:
246218
"^/_matrix/client/(api/v1|r0|v3|unstable)/knock/",
247219
"^/_matrix/client/(api/v1|r0|v3|unstable)/profile/",
248220
],
249-
shared_extra_conf=lambda _worker_name: {},
250-
worker_extra_conf="",
251221
),
252222
"frontend_proxy": WorkerTemplate(
253223
listener_resources=["client", "replication"],
254224
endpoint_patterns=["^/_matrix/client/(api/v1|r0|v3|unstable)/keys/upload"],
255-
shared_extra_conf=lambda _worker_name: {},
256-
worker_extra_conf="",
257225
),
258226
"account_data": WorkerTemplate(
259227
listener_resources=["client", "replication"],
260228
endpoint_patterns=[
261229
"^/_matrix/client/(r0|v3|unstable)/.*/tags",
262230
"^/_matrix/client/(r0|v3|unstable)/.*/account_data",
263231
],
264-
shared_extra_conf=lambda _worker_name: {},
265-
worker_extra_conf="",
266232
),
267233
"presence": WorkerTemplate(
268234
listener_resources=["client", "replication"],
269235
endpoint_patterns=["^/_matrix/client/(api/v1|r0|v3|unstable)/presence/"],
270-
shared_extra_conf=lambda _worker_name: {},
271-
worker_extra_conf="",
272236
),
273237
"receipts": WorkerTemplate(
274238
listener_resources=["client", "replication"],
275239
endpoint_patterns=[
276240
"^/_matrix/client/(r0|v3|unstable)/rooms/.*/receipt",
277241
"^/_matrix/client/(r0|v3|unstable)/rooms/.*/read_markers",
278242
],
279-
shared_extra_conf=lambda _worker_name: {},
280-
worker_extra_conf="",
281243
),
282244
"to_device": WorkerTemplate(
283245
listener_resources=["client", "replication"],
284246
endpoint_patterns=["^/_matrix/client/(r0|v3|unstable)/sendToDevice/"],
285-
shared_extra_conf=lambda _worker_name: {},
286-
worker_extra_conf="",
287247
),
288248
"typing": WorkerTemplate(
289249
listener_resources=["client", "replication"],
290250
endpoint_patterns=["^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/typing"],
291-
shared_extra_conf=lambda _worker_name: {},
292-
worker_extra_conf="",
293251
),
294252
}
295253

0 commit comments

Comments
 (0)