Skip to content

Relation#calculate with finder options is deprecated from rails 4. #37

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.

Sign up for GitHub

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

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

Relation#calculate with finder options is deprecated from rails 4. #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion app/controllers/sidekiq/monitor/api/queues_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ def show
queue = params[:queue]
render json: {}, status: 404 and return if queue.blank?

status_counts = Sidekiq::Monitor::Job.where(queue: queue).count(group: 'status')
if ::Rails::VERSION::MAJOR >= 4
status_counts = Sidekiq::Monitor::Job.where(queue: queue).group('status').count
else
status_counts = Sidekiq::Monitor::Job.where(queue: queue).count(group: 'status')
end

ordered_status_counts = {}
Sidekiq::Monitor::Job.statuses.each do |status|
ordered_status_counts[status] = status_counts.has_key?(status) ? status_counts[status] : 0
Expand Down