Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore future jobs in jobs:check. #1159

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

joshuapinter
Copy link

If there are scheduled jobs in the future, they should not be included in the jobs:check, which is intended to look for jobs that should be processed but have not yet been processed.

If there are scheduled jobs in the future, they should not be included in the `jobs:check`, which is intended to look for jobs that *should* be processed but have not yet been processed.
@@ -30,7 +30,7 @@
task :check, [:max_age] => :environment do |_, args|
args.with_defaults(:max_age => 300)

unprocessed_jobs = Delayed::Job.where('attempts = 0 AND created_at < ?', Time.now - args[:max_age].to_i).count
unprocessed_jobs = Delayed::Job.where('attempts = 0 AND created_at < ? AND run_at <= ?', Time.now - args[:max_age].to_i, Time.now).count
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conceptually I think the max age applies to both times. Probably:

Suggested change
unprocessed_jobs = Delayed::Job.where('attempts = 0 AND created_at < ? AND run_at <= ?', Time.now - args[:max_age].to_i, Time.now).count
unprocessed_jobs = Delayed::Job.where('attempts = 0 AND created_at < :time AND run_at < :time', time: args[:max_age].to_i.seconds.ago).count

And it is possibly better to replace created_at with run_at instead of querying both.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants