Update docker config and move some workers to different queues (#8345)

* Reorder docker-compose's sidekiq queues to match config/sidekiq.yml

* Make the ̀“mailers” queue higher priority than “pull”

diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 244e9ea48b422c5bf5d9b10cbb878ff541ebe679..59dfeaf975273cf5f2dea1cd9d89325c64156735 100644 (file)
--- 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 3b50f6d31c5f49816a77bd672f0cf83b5f670f04..070a953840c6fdcfa93d46c2b12cc68c6b9d638d 100644 (file)
--- 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