Skip to content

Commit 89682c8

Browse files
committed
add 4x synapse federation sender workers
1 parent 8e68084 commit 89682c8

11 files changed

+178
-1
lines changed

deploy-static

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ rsync -pcv --chmod=644 --fsync --preallocate syslog-ng/conf.d/synapse.conf $remo
5252
ssh $remote syslog-ng-ctl reload
5353
rsync -pcv --chmod=644 --fsync --preallocate logrotate.d/synapse $remote:/etc/logrotate.d/synapse
5454
rsync -pcv --chmod=644 --fsync --preallocate synapse/log_config.yaml $remote:/etc/synapse/log_config.yaml
55+
rsync -rpcv --delete synapse/workers/ $remote:/etc/synapse/workers/
5556

5657
rsync -pcv --chmod=755 --fsync --preallocate remote-backup $remote:/usr/local/bin/
5758
rsync -pcv --chmod=644 --fsync --preallocate systemd/system/remote-backup.timer $remote:/etc/systemd/system/remote-backup.timer

logrotate.d/synapse

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/var/log/synapse/main.log {
1+
/var/log/synapse/main.log /var/log/synapse/federation_sender1.log /var/log/synapse/federation_sender2.log /var/log/synapse/federation_sender3.log /var/log/synapse/federation_sender4.log {
22
missingok
33
maxsize 1G
44
nodelaycompress
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
worker_app: synapse.app.generic_worker
2+
worker_name: federation_sender1
3+
4+
worker_listeners:
5+
- path: /run/synapse/federation_sender1_replication.sock
6+
mode: 432
7+
type: http
8+
resources:
9+
- names: [replication]
10+
11+
worker_log_config: /etc/synapse/workers/federation_sender1_log_config.yaml
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
version: 1
2+
3+
formatters:
4+
syslog_fmt:
5+
format: '%(name)s: [%(request)s] %(message)s'
6+
7+
filters:
8+
context:
9+
(): synapse.logging.context.LoggingContextFilter
10+
request: ""
11+
12+
handlers:
13+
syslog:
14+
class: logging.handlers.SysLogHandler
15+
formatter: syslog_fmt
16+
filters: [context]
17+
address: /run/synapse-federation_sender1-log
18+
19+
root:
20+
level: INFO
21+
handlers: [syslog]
22+
23+
disable_existing_loggers: False
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
worker_app: synapse.app.generic_worker
2+
worker_name: federation_sender2
3+
4+
worker_listeners:
5+
- path: /run/synapse/federation_sender2_replication.sock
6+
mode: 432
7+
type: http
8+
resources:
9+
- names: [replication]
10+
11+
worker_log_config: /etc/synapse/workers/federation_sender2_log_config.yaml
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
version: 1
2+
3+
formatters:
4+
syslog_fmt:
5+
format: '%(name)s: [%(request)s] %(message)s'
6+
7+
filters:
8+
context:
9+
(): synapse.logging.context.LoggingContextFilter
10+
request: ""
11+
12+
handlers:
13+
syslog:
14+
class: logging.handlers.SysLogHandler
15+
formatter: syslog_fmt
16+
filters: [context]
17+
address: /run/synapse-federation_sender2-log
18+
19+
root:
20+
level: INFO
21+
handlers: [syslog]
22+
23+
disable_existing_loggers: False
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
worker_app: synapse.app.generic_worker
2+
worker_name: federation_sender3
3+
4+
worker_listeners:
5+
- path: /run/synapse/federation_sender3_replication.sock
6+
mode: 432
7+
type: http
8+
resources:
9+
- names: [replication]
10+
11+
worker_log_config: /etc/synapse/workers/federation_sender3_log_config.yaml
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
version: 1
2+
3+
formatters:
4+
syslog_fmt:
5+
format: '%(name)s: [%(request)s] %(message)s'
6+
7+
filters:
8+
context:
9+
(): synapse.logging.context.LoggingContextFilter
10+
request: ""
11+
12+
handlers:
13+
syslog:
14+
class: logging.handlers.SysLogHandler
15+
formatter: syslog_fmt
16+
filters: [context]
17+
address: /run/synapse-federation_sender3-log
18+
19+
root:
20+
level: INFO
21+
handlers: [syslog]
22+
23+
disable_existing_loggers: False
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
worker_app: synapse.app.generic_worker
2+
worker_name: federation_sender4
3+
4+
worker_listeners:
5+
- path: /run/synapse/federation_sender4_replication.sock
6+
mode: 432
7+
type: http
8+
resources:
9+
- names: [replication]
10+
11+
worker_log_config: /etc/synapse/workers/federation_sender4_log_config.yaml
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
version: 1
2+
3+
formatters:
4+
syslog_fmt:
5+
format: '%(name)s: [%(request)s] %(message)s'
6+
7+
filters:
8+
context:
9+
(): synapse.logging.context.LoggingContextFilter
10+
request: ""
11+
12+
handlers:
13+
syslog:
14+
class: logging.handlers.SysLogHandler
15+
formatter: syslog_fmt
16+
filters: [context]
17+
address: /run/synapse-federation_sender4-log
18+
19+
root:
20+
level: INFO
21+
handlers: [syslog]
22+
23+
disable_existing_loggers: False

0 commit comments

Comments
 (0)