Revert removal of generic and sender workers 3 & 4

This reverts commits 0e7f3b6120,
70aa3d517e, and
b0627430bd
This commit is contained in:
BBaoVanC 2021-08-27 18:20:18 -05:00
parent 0e7f3b6120
commit a58a1b12c9
4 changed files with 100 additions and 0 deletions

View File

@ -26,6 +26,16 @@ scrape_configs:
instance: "matrix.boba.best" instance: "matrix.boba.best"
job: "generic_worker" job: "generic_worker"
index: 2 index: 2
- targets: ["generic3:8008"]
labels:
instance: "matrix.boba.best"
job: "generic_worker"
index: 3
- targets: ["generic4:8008"]
labels:
instance: "matrix.boba.best"
job: "generic_worker"
index: 4
- targets: ["sender1:8008"] - targets: ["sender1:8008"]
labels: labels:
@ -37,6 +47,16 @@ scrape_configs:
instance: "matrix.boba.best" instance: "matrix.boba.best"
job: "federation_sender" job: "federation_sender"
index: 2 index: 2
- targets: ["sender3:8008"]
labels:
instance: "matrix.boba.best"
job: "federation_sender"
index: 3
- targets: ["sender4:8008"]
labels:
instance: "matrix.boba.best"
job: "federation_sender"
index: 4
- targets: ["media:8008"] - targets: ["media:8008"]
labels: labels:

View File

@ -78,6 +78,34 @@ services:
healthcheck: healthcheck:
disable: true disable: true
sender3:
image: matrixdotorg/synapse:$SYNAPSE_TAG
restart: always
command: ["run", "--config-path=/data/homeserver.yaml", "--config-path=/workers/replication.yaml", "--config-path=/workers/sender3.yaml"]
environment:
- SYNAPSE_WORKER=synapse.app.federation_sender
volumes:
- ./data/synapse:/data
- ./workers:/workers
depends_on:
- synapse
healthcheck:
disable: true
sender4:
image: matrixdotorg/synapse:$SYNAPSE_TAG
restart: always
command: ["run", "--config-path=/data/homeserver.yaml", "--config-path=/workers/replication.yaml", "--config-path=/workers/sender4.yaml"]
environment:
- SYNAPSE_WORKER=synapse.app.federation_sender
volumes:
- ./data/synapse:/data
- ./workers:/workers
depends_on:
- synapse
healthcheck:
disable: true
media: media:
image: matrixdotorg/synapse:$SYNAPSE_TAG image: matrixdotorg/synapse:$SYNAPSE_TAG
restart: always restart: always
@ -126,6 +154,38 @@ services:
labels: labels:
synapse-autoheal: "true" synapse-autoheal: "true"
generic3:
image: matrixdotorg/synapse:$SYNAPSE_TAG
restart: always
command: ["run", "--config-path=/data/homeserver.yaml", "--config-path=/workers/replication.yaml", "--config-path=/workers/generic.yaml"]
environment:
- SYNAPSE_WORKER=synapse.app.generic_worker
volumes:
- ./data/synapse:/data
- ./workers:/workers
depends_on:
- synapse
ports:
- 127.0.0.1:8012:8008/tcp
labels:
synapse-autoheal: "true"
generic4:
image: matrixdotorg/synapse:$SYNAPSE_TAG
restart: always
command: ["run", "--config-path=/data/homeserver.yaml", "--config-path=/workers/replication.yaml", "--config-path=/workers/generic.yaml"]
environment:
- SYNAPSE_WORKER=synapse.app.generic_worker
volumes:
- ./data/synapse:/data
- ./workers:/workers
depends_on:
- synapse
ports:
- 127.0.0.1:8013:8008/tcp
labels:
synapse-autoheal: "true"
prometheus: prometheus:
image: prom/prometheus:latest image: prom/prometheus:latest
restart: always restart: always

10
workers/sender3.yaml Normal file
View File

@ -0,0 +1,10 @@
worker_app: synapse.app.federation_sender
worker_name: sender3
worker_listeners:
- type: http
port: 8008
x_forwarded: true
resources:
- names:
- metrics

10
workers/sender4.yaml Normal file
View File

@ -0,0 +1,10 @@
worker_app: synapse.app.federation_sender
worker_name: sender4
worker_listeners:
- type: http
port: 8008
x_forwarded: true
resources:
- names:
- metrics