Made sidekiqman less powerful--was pummling puma
This commit is contained in:
parent
9eaa8b2822
commit
87e490b5fa
|
@ -92,9 +92,9 @@ services:
|
||||||
image: git.solarpunk.moe/solarpunk/mastodon:latest
|
image: git.solarpunk.moe/solarpunk/mastodon:latest
|
||||||
restart: always
|
restart: always
|
||||||
env_file: .env.production
|
env_file: .env.production
|
||||||
command: bundle exec sidekiq -c 4 -q mailers -q scheduler
|
command: bundle exec sidekiq -c 2 -q mailers -q scheduler
|
||||||
environment:
|
environment:
|
||||||
- DB_POOL=4
|
- DB_POOL=2
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
|
@ -104,17 +104,17 @@ services:
|
||||||
- mail
|
- mail
|
||||||
volumes:
|
volumes:
|
||||||
- ./public/system:/mastodon/public/system
|
- ./public/system:/mastodon/public/system
|
||||||
healthcheck:
|
# healthcheck:
|
||||||
test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
|
# test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
|
||||||
|
|
||||||
sidekiq-ingress-pull-push-default:
|
sidekiq-ingress-pull-push-default:
|
||||||
build: .
|
build: .
|
||||||
image: git.solarpunk.moe/solarpunk/mastodon:latest
|
image: git.solarpunk.moe/solarpunk/mastodon:latest
|
||||||
restart: always
|
restart: always
|
||||||
env_file: .env.production
|
env_file: .env.production
|
||||||
command: bundle exec sidekiq -c 25 -q ingress -q pull -q push -q default
|
command: bundle exec sidekiq -c 5 -q ingress -q pull -q push -q default
|
||||||
environment:
|
environment:
|
||||||
- DB_POOL=4
|
- DB_POOL=5
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
|
@ -124,17 +124,17 @@ services:
|
||||||
- mail
|
- mail
|
||||||
volumes:
|
volumes:
|
||||||
- ./public/system:/mastodon/public/system
|
- ./public/system:/mastodon/public/system
|
||||||
healthcheck:
|
# healthcheck:
|
||||||
test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
|
# test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
|
||||||
|
|
||||||
sidekiq-default-push-pull:
|
sidekiq-default-push-pull:
|
||||||
build: .
|
build: .
|
||||||
image: git.solarpunk.moe/solarpunk/mastodon:latest
|
image: git.solarpunk.moe/solarpunk/mastodon:latest
|
||||||
restart: always
|
restart: always
|
||||||
env_file: .env.production
|
env_file: .env.production
|
||||||
command: bundle exec sidekiq -c 25 -q default -q ingress -q push -q pull
|
command: bundle exec sidekiq -c 3 -q default -q ingress -q push -q pull
|
||||||
environment:
|
environment:
|
||||||
- DB_POOL=25
|
- DB_POOL=3
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
|
@ -144,17 +144,17 @@ services:
|
||||||
- mail
|
- mail
|
||||||
volumes:
|
volumes:
|
||||||
- ./public/system:/mastodon/public/system
|
- ./public/system:/mastodon/public/system
|
||||||
healthcheck:
|
#healthcheck:
|
||||||
test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
|
# test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
|
||||||
|
|
||||||
sidekiq-pull-push-default:
|
sidekiq-pull-push-default:
|
||||||
build: .
|
build: .
|
||||||
image: git.solarpunk.moe/solarpunk/mastodon:latest
|
image: git.solarpunk.moe/solarpunk/mastodon:latest
|
||||||
restart: always
|
restart: always
|
||||||
env_file: .env.production
|
env_file: .env.production
|
||||||
command: bundle exec sidekiq -c 25 -q pull -q push -q default -q ingress
|
command: bundle exec sidekiq -c 5 -q pull -q push -q default -q ingress
|
||||||
environment:
|
environment:
|
||||||
- DB_POOL=25
|
- DB_POOL=5
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
|
@ -164,8 +164,8 @@ services:
|
||||||
- mail
|
- mail
|
||||||
volumes:
|
volumes:
|
||||||
- ./public/system:/mastodon/public/system
|
- ./public/system:/mastodon/public/system
|
||||||
healthcheck:
|
#healthcheck:
|
||||||
test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
|
# test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
|
||||||
|
|
||||||
## Uncomment to enable federation with tor instances along with adding the following ENV variables
|
## Uncomment to enable federation with tor instances along with adding the following ENV variables
|
||||||
## http_proxy=http://privoxy:8118
|
## http_proxy=http://privoxy:8118
|
||||||
|
|
Loading…
Reference in a new issue