about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-09-02 16:13:06 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-09-02 16:13:06 +0200
commitfdda332e4d749b7d0c39d0d5c4317c243b00e238 (patch)
treeba8120c6f64b176f34abdce9706c3f8be7a68bb2
parent7c12c7b1246b991c68f4b51573538e02b3968beb (diff)
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”
-rw-r--r--config/sidekiq.yml2
-rw-r--r--docker-compose.yml2
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