From fdda332e4d749b7d0c39d0d5c4317c243b00e238 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sun, 2 Sep 2018 16:13:06 +0200
Subject: [PATCH] Update docker config and move some workers to different
queues (#8345)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Reorder docker-compose's sidekiq queues to match config/sidekiq.yml
* Make the ̀“mailers” queue higher priority than “pull”
---
config/sidekiq.yml | 2 +-
docker-compose.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 244e9ea48..59dfeaf97 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -3,8 +3,8 @@
:queues:
- default
- push
- - pull
- mailers
+ - pull
:schedule:
subscriptions_scheduler:
cron: '<%= Random.rand(0..59) %> <%= Random.rand(4..6) %> * * *'
diff --git a/docker-compose.yml b/docker-compose.yml
index 3b50f6d31..070a95384 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -68,7 +68,7 @@ services:
image: tootsuite/mastodon
restart: always
env_file: .env.production
- command: bundle exec sidekiq -q default -q mailers -q pull -q push
+ command: bundle exec sidekiq -q default -q push -q mailers -q pull
depends_on:
- db
- redis