DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10288 from colinux/fix-cron-queue-adapter

Browse source 
Tech (jobs): (re)enqueue crons dans sidekiq
This commit is contained in:
LeSim 2024-04-09 07:23:14 +00:00 committed by GitHub
commit 5a775acbe0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -23,7 +23,7 @@ gem 'chunky_png'
gem 'clamav-client', require: 'clamav/client' gem 'clamav-client', require: 'clamav/client'
gem 'daemons' gem 'daemons'
gem 'deep_cloneable' # Enable deep clone of active record models gem 'deep_cloneable' # Enable deep clone of active record models
gem 'delayed_cron_job' # Cron jobs gem 'delayed_cron_job', require: false # Cron jobs
gem 'delayed_job_active_record' gem 'delayed_job_active_record'
gem 'delayed_job_web' gem 'delayed_job_web'
gem 'devise', git: 'https://github.com/heartcombo/devise.git', ref: "edffc79bf05d7f1c58ba50ffeda645e2e4ae0cb1" # Gestion des comptes utilisateurs, drop ref on next release: 4.9.4 gem 'devise', git: 'https://github.com/heartcombo/devise.git', ref: "edffc79bf05d7f1c58ba50ffeda645e2e4ae0cb1" # Gestion des comptes utilisateurs, drop ref on next release: 4.9.4

4
app/jobs/cron/cron_job.rb
View file

@ -11,7 +11,7 @@ class Cron::CronJob < ApplicationJob
remove if cron_expression_changed? remove if cron_expression_changed?
if !scheduled? if !scheduled?
if SIDEKIQ_ENABLED if queue_adapter == :sidekiq
Sidekiq::Cron::Job.create(name: name, cron: cron_expression, class: name) Sidekiq::Cron::Job.create(name: name, cron: cron_expression, class: name)
else else
set(cron: cron_expression).perform_later set(cron: cron_expression).perform_later
@ -36,7 +36,7 @@ class Cron::CronJob < ApplicationJob
end end
def enqueued_cron_job def enqueued_cron_job
if SIDEKIQ_ENABLED if queue_adapter == :sidekiq
sidekiq_cron_job sidekiq_cron_job
else else
delayed_job delayed_job

4
config/initializers/transition_to_sidekiq.rb
View file

@ -53,5 +53,9 @@ if Rails.env.production? && SIDEKIQ_ENABLED
class Migrations::BackfillStableIdJob class Migrations::BackfillStableIdJob
self.queue_adapter = :sidekiq self.queue_adapter = :sidekiq
end end
class Cron::CronJob < ApplicationJob
self.queue_adapter = :sidekiq
end
end end
end end