Prevent delayed_job from taking from every queue

Previous commit didn't work because delayed_job takes from all queues indiscriminately unless you manually specify the QUEUES env var. There is no way to do this based on prefix, but I've opened collectiveidea/delayed_job#1095. For now we'll have to keep QUEUES in sync with the jobs we have.
glacials · Jul 1, 2019 · 4d81f81 · 4d81f81
1 parent 671ff01
commit 4d81f81
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 2 deletions.
diff --git a/app/jobs/broadcast_upload_job.rb b/app/jobs/broadcast_upload_job.rb
@@ -1,4 +1,5 @@
 class BroadcastUploadJob < ApplicationJob
+  # Adding or deleting a job? Reflect the change in the QUEUES environment variable in docker-compose-production.yml.
   queue_as :broadcast_upload
 
   def perform(run)

diff --git a/app/jobs/discover_runner_job.rb b/app/jobs/discover_runner_job.rb
@@ -1,4 +1,5 @@
 class DiscoverRunnerJob < ApplicationJob
+  # Adding or deleting a job? Reflect the change in the QUEUES environment variable in docker-compose-production.yml.
   queue_as :discover_runner
 
   def perform(run)

diff --git a/app/jobs/highlight_cleanup_job.rb b/app/jobs/highlight_cleanup_job.rb
@@ -1,4 +1,5 @@
 class HighlightCleanupJob < ApplicationJob
+  # Adding or deleting a job? Reflect the change in the QUEUES environment variable in docker-compose-production.yml.
   queue_as :highlight_cleanup
 
   def perform(highlight_suggestion)

diff --git a/app/jobs/refresh_game_job.rb b/app/jobs/refresh_game_job.rb
@@ -1,4 +1,5 @@
 class RefreshGameJob < ApplicationJob
+  # Adding or deleting a job? Reflect the change in the QUEUES environment variable in docker-compose-production.yml.
   queue_as :refresh_game
 
   def perform(game, category)

diff --git a/app/jobs/sync_user_follows_job.rb b/app/jobs/sync_user_follows_job.rb
@@ -1,4 +1,5 @@
 class SyncUserFollowsJob < ApplicationJob
+  # Adding or deleting a job? Reflect the change in the QUEUES environment variable in docker-compose-production.yml.
   queue_as :sync_user_follows
 
   def perform(user, twitch_user)

diff --git a/docker-compose-production.yml b/docker-compose-production.yml
@@ -15,7 +15,7 @@ x-environment:
   - PATREON_CLIENT_ID
   - PATREON_CLIENT_SECRET
   - PATREON_WEBHOOK_SECRET
-  - QUEUE_PREFIX
+  - QUEUES=broadcast_upload,discover_runner,highlight_cleanup,refresh_game,sync_user_follows # keep this in sync with every job in app/jobs
   - RACK_ENV=production
   - RAILS_LOG_TO_STDOUT=true # Log to stdout so docker/docker-compose can take over logs
   - RAILS_SERVE_STATIC_FILES=1

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,7 +10,7 @@ x-environment:
   - NODE_ENV=development
   - PATREON_CLIENT_ID
   - PATREON_CLIENT_SECRET
-  - QUEUE_PREFIX=dev
+  - QUEUES=broadcast_upload,discover_runner,highlight_cleanup,refresh_game,sync_user_follows # this is here only to make you also update docker-compose-production.yml
   - RAILS_LOG_TO_STDOUT=true # Log to stdout so docker/docker-compose can take over logs
   - RAILS_ENV
   - RAILS_ROOT="/app"