mirror of
https://github.com/neocities/neocities.git
synced 2025-04-25 01:32:36 +02:00
Dedupe scheduled archive jobs as well as queued jobs
This commit is contained in:
parent
c41c0433b2
commit
7b7fc91eb4
1 changed files with 11 additions and 1 deletions
|
@ -18,11 +18,21 @@ class ArchiveWorker
|
||||||
logger.info "JOB ID: #{jid} #{site_id.inspect}"
|
logger.info "JOB ID: #{jid} #{site_id.inspect}"
|
||||||
queue.each do |job|
|
queue.each do |job|
|
||||||
if job.args == [site_id] && job.jid != jid
|
if job.args == [site_id] && job.jid != jid
|
||||||
logger.info "DELETING #{job.jid} #{job.args.inspect}"
|
logger.info "DELETING #{job.jid} for site_id #{site_id}"
|
||||||
job.delete
|
job.delete
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
scheduled_jobs = Sidekiq::ScheduledSet.new.select do |scheduled_job|
|
||||||
|
scheduled_job.klass == 'ArchiveWorker' &&
|
||||||
|
scheduled_job.args[0] == site_id
|
||||||
|
end
|
||||||
|
|
||||||
|
scheduled_jobs.each do |scheduled_job|
|
||||||
|
logger.info "DELETING scheduled job #{scheduled_job.jid} for site_id #{site_id}"
|
||||||
|
scheduled_job.delete
|
||||||
|
end
|
||||||
|
|
||||||
site.archive!
|
site.archive!
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue