Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
delayed (3.0.0)
delayed (3.0.1)
activerecord (>= 6.0)
concurrent-ruby

Expand Down
9 changes: 4 additions & 5 deletions lib/delayed/monitor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,11 @@ def max_lock_age_grouped
end

def max_age_grouped
live_counts.transform_values { |j| time_ago(db_now(j), j.run_at) }
pending_counts.transform_values { |j| time_ago(db_now(j), j.run_at) }
end

def alert_age_percent_grouped
live_counts.each_with_object({}) do |((priority, queue), j), metrics|
pending_counts.each_with_object({}) do |((priority, queue), j), metrics|
max_age = time_ago(db_now(j), j.run_at)
alert_age = Priority.new(priority).alert_age
metrics[[priority, queue]] = [max_age / alert_age * 100, 100].min if alert_age
Expand All @@ -169,17 +169,15 @@ def oldest_locked_job_grouped
end

def oldest_workable_job_grouped
live_counts.transform_values(&:run_at).compact
pending_counts.transform_values(&:run_at).compact
end

def live_counts
@memo[:live_counts] ||= grouped_query(
jobs.live,
include_db_time: true,
count: [:count, '*'],
future_count: [:sum, case_when(Job.future_clause.to_sql)],
erroring_count: [:sum, case_when(Job.erroring_clause.to_sql)],
run_at: [:min, case_when(Job.pending_clause.to_sql, 'run_at')],
)
end

Expand All @@ -190,6 +188,7 @@ def pending_counts
claimed_count: [:sum, case_when(Job.claimed_clause.to_sql)],
claimable_count: [:sum, case_when(Job.claimable_clause.to_sql)],
locked_at: [:min, case_when(Job.claimed_clause.to_sql, 'locked_at')],
run_at: [:min, case_when(Job.claimable_clause.to_sql, 'run_at')],
)
end

Expand Down
2 changes: 1 addition & 1 deletion lib/delayed/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module Delayed
VERSION = '3.0.0'
VERSION = '3.0.1'
end
Loading
Loading