From 809f0f3829fd6bcd29c160d9875d3e1846361579 Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Thu, 24 Apr 2014 22:16:34 -0700 Subject: [PATCH] Show warning on Queues page if a queue is paused, fixes #1672 --- Changes.md | 1 + lib/sidekiq/api.rb | 5 +++++ lib/sidekiq/web.rb | 1 + web/locales/en.yml | 1 + web/views/queue.erb | 3 +++ web/views/queues.erb | 3 +++ 6 files changed, 14 insertions(+) diff --git a/Changes.md b/Changes.md index bf9e0cc9..63ddffb9 100644 --- a/Changes.md +++ b/Changes.md @@ -1,6 +1,7 @@ HEAD ----------- +- Show warning on the Queues page if a queue is paused [#1672] - Only activate the ActiveRecord middleware if ActiveRecord::Base is defined on boot. [#1666] - Add ability to disable jobs going to the DJQ with the `dead` option. ```ruby diff --git a/lib/sidekiq/api.rb b/lib/sidekiq/api.rb index f0b741c4..5ec2c43e 100644 --- a/lib/sidekiq/api.rb +++ b/lib/sidekiq/api.rb @@ -132,6 +132,11 @@ module Sidekiq Sidekiq.redis { |con| con.llen(@rname) } end + # Sidekiq Pro overrides this + def paused? + false + end + def latency entry = Sidekiq.redis do |conn| conn.lrange(@rname, -1, -1) diff --git a/lib/sidekiq/web.rb b/lib/sidekiq/web.rb index 79fe5bcd..23512024 100644 --- a/lib/sidekiq/web.rb +++ b/lib/sidekiq/web.rb @@ -51,6 +51,7 @@ module Sidekiq halt 404 unless params[:name] @count = (params[:count] || 25).to_i @name = params[:name] + @queue = Sidekiq::Queue.new(@name) (@current_page, @total_size, @messages) = page("queue:#{@name}", params[:page], @count) @messages = @messages.map {|msg| Sidekiq.load_json(msg) } erb :queue diff --git a/web/locales/en.yml b/web/locales/en.yml index 5200b6eb..56c1ab37 100644 --- a/web/locales/en.yml +++ b/web/locales/en.yml @@ -66,3 +66,4 @@ en: # <---- change this to your locale code Thread: Thread Threads: Threads Jobs: Jobs + Paused: Paused diff --git a/web/views/queue.erb b/web/views/queue.erb index b711254b..2f57bef5 100644 --- a/web/views/queue.erb +++ b/web/views/queue.erb @@ -2,6 +2,9 @@

<%= t('CurrentMessagesInQueue', :queue => @name) %> + <% if @queue.paused? %> + <%= t('Paused') %> + <% end %>

diff --git a/web/views/queues.erb b/web/views/queues.erb index e82c1362..b417a681 100644 --- a/web/views/queues.erb +++ b/web/views/queues.erb @@ -10,6 +10,9 @@ <%= queue.name %> + <% if queue.paused? %> + <%= t('Paused') %> + <% end %> <%= number_with_delimiter(queue.size) %>