From cd5230a1075ac207c30b4f789ffcfd02ec64add5 Mon Sep 17 00:00:00 2001
From: Chris Hoffman <chris@navigatingcancer.com>
Date: Sun, 27 Jul 2014 23:15:46 -0400
Subject: [PATCH] add queues for stats and as a filter option

---
 lib/resque_cleaner.rb                          | 13 +++++++++++++
 lib/resque_cleaner/server.rb                   | 18 +++++++++++++++++-
 lib/resque_cleaner/server/views/cleaner.erb    |  9 +++++++++
 .../server/views/cleaner_list.erb              |  3 +++
 test/resque_cleaner_test.rb                    |  6 ++++++
 test/resque_web_test.rb                        |  2 ++
 6 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/lib/resque_cleaner.rb b/lib/resque_cleaner.rb
index 4a8148b..0469674 100644
--- a/lib/resque_cleaner.rb
+++ b/lib/resque_cleaner.rb
@@ -48,6 +48,19 @@ def stats_by_date(&block)
         stats
       end
 
+      # Stats by queue.
+      def stats_by_queue(&block)
+        jobs, stats = select(&block), {}
+        jobs.each do |job|
+          queue = job["queue"] || "UNKNOWN"
+          stats[queue] ||= 0
+          stats[queue] += 1
+        end
+
+        print_stats(stats) if print?
+        stats
+      end
+
       # Stats by class.
       def stats_by_class(&block)
         jobs, stats = select(&block), {}
diff --git a/lib/resque_cleaner/server.rb b/lib/resque_cleaner/server.rb
index f559ed6..a7ad292 100644
--- a/lib/resque_cleaner/server.rb
+++ b/lib/resque_cleaner/server.rb
@@ -80,6 +80,16 @@ def time_filter(id, name, value)
             html += "</select>"
           end
 
+          def queue_filter(id, name, queues, value)
+            html = "<select id=\"#{id}\" name=\"#{name}\">"
+            html += "<option value=\"\">-</option>"
+            queues.each do |q|
+              selected = q == value ? 'selected="selected"' : ''
+              html += "<option #{selected} value=\"#{q}\">#{q}</option>"
+            end
+            html += "</select>"
+          end
+
           def class_filter(id, name, klasses, value)
             html = "<select id=\"#{id}\" name=\"#{name}\">"
             html += "<option value=\"\">-</option>"
@@ -117,18 +127,21 @@ def text_filter(id, name, value)
           load_cleaner_filter
 
           @jobs = cleaner.select
-          @stats = { :klass => {}, :exception => {} }
+          @stats = { klass: {}, exception: {}, queue: {} }
           @total = Hash.new(0)
           @jobs.each do |job|
             klass = job["payload"]["class"] || 'UNKNOWN'
             exception = job["exception"] || 'UNKNOWN'
+            queue = job["queue"] || 'UNKNOWN'
             failed_at = Time.parse job["failed_at"]
             @stats[:klass][klass] ||= Hash.new(0)
             @stats[:exception][exception] ||= Hash.new(0)
+            @stats[:queue][queue] ||= Hash.new(0)
 
             [
               @stats[:klass][klass],
               @stats[:exception][exception],
+              @stats[:queue][queue],
               @total
             ].each do |stat|
               stat[:total] += 1
@@ -156,6 +169,7 @@ def text_filter(id, name, value)
 
           @klasses = cleaner.stats_by_class.keys
           @exceptions = cleaner.stats_by_exception.keys
+          @queues = cleaner.stats_by_queue.keys
           @count = cleaner.select(&block).size
 
           erb File.read(ResqueCleaner::Server.erb_path('cleaner_list.erb'))
@@ -226,6 +240,7 @@ def load_cleaner_filter
       @to = params[:t]=="" ? nil : params[:t]
       @klass = params[:c]=="" ? nil : params[:c]
       @exception = params[:ex]=="" ? nil : params[:ex]
+      @queue = params[:q]=="" ? nil : params[:q]
       @regex = params[:regex]=="" ? nil : params[:regex]
     end
 
@@ -247,6 +262,7 @@ def filter_block
         (!@from || j.after?(hours_ago(@from))) &&
         (!@to || j.before?(hours_ago(@to))) &&
         (!@klass || j.klass?(@klass)) &&
+        (!@queue || j.queue?(@queue)) &&
         (!@exception || j.exception?(@exception)) &&
         (!@sha1 || @sha1[Digest::SHA1.hexdigest(j.to_json)]) &&
         (!@regex || j.to_s =~ /#{@regex}/)
diff --git a/lib/resque_cleaner/server/views/cleaner.erb b/lib/resque_cleaner/server/views/cleaner.erb
index 879c176..700e0f9 100644
--- a/lib/resque_cleaner/server/views/cleaner.erb
+++ b/lib/resque_cleaner/server/views/cleaner.erb
@@ -19,6 +19,15 @@
         locals: {q: 'ex', type: 'exception'}
       ) %>
 
+  <div class="title clearfix">
+    <h1>Group by queue</h1>
+  </div>
+
+  <%= erb(
+        File.read(ResqueCleaner::Server.erb_path("_stats.erb")),
+        locals: {q: 'q', type: 'queue'}
+      ) %>
+
   <% if @cleaner.limiter.on? %>
     <%= erb File.read(ResqueCleaner::Server.erb_path("_limiter.erb")) %>
   <% end %>
diff --git a/lib/resque_cleaner/server/views/cleaner_list.erb b/lib/resque_cleaner/server/views/cleaner_list.erb
index 8ed5bf1..b8c5c80 100644
--- a/lib/resque_cleaner/server/views/cleaner_list.erb
+++ b/lib/resque_cleaner/server/views/cleaner_list.erb
@@ -15,6 +15,9 @@
         <span class="exception_filter">
           Exception: <%= exception_filter("filter_class","ex",@exceptions,@exception)%>
         </span>
+        <span class="queue_filter">
+          Queue: <%= queue_filter("filter_class","q",@queues,@queue)%>
+        </span>
         <span class="time_filter">
           From: <%= time_filter("filter_from","f",@from)%>
         </span>
diff --git a/test/resque_cleaner_test.rb b/test/resque_cleaner_test.rb
index 605f7be..15c7bd0 100644
--- a/test/resque_cleaner_test.rb
+++ b/test/resque_cleaner_test.rb
@@ -177,6 +177,12 @@
     assert_equal 7, ret['SyntaxError']
   end
 
+  it "#stats_by_queue returns stats grouped by queue" do
+    ret = @cleaner.stats_by_queue
+    assert_equal 22, ret['jobs']
+    assert_equal 20, ret['jobs2']
+  end
+
   it "#lock ensures that a new failure job doesn't affect in a limit mode" do
     @cleaner.limiter.maximum = 23
     @cleaner.limiter.lock do
diff --git a/test/resque_web_test.rb b/test/resque_web_test.rb
index f98d280..8ace6cb 100644
--- a/test/resque_web_test.rb
+++ b/test/resque_web_test.rb
@@ -35,6 +35,7 @@ def setup_some_failed_jobs
     get "/cleaner"
     assert last_response.body.include?('BadJob')
     assert last_response.body =~ /\bException\b/
+    assert last_response.body =~ /\bQueue\b/
   end
 
   it "#cleaner_list should respond with success" do
@@ -44,6 +45,7 @@ def setup_some_failed_jobs
 
   it '#cleaner_list shows the failed jobs' do
     get "/cleaner_list"
+    File.open(File.join(File.dirname(__FILE__),'..','tmp','response.html'), 'w') { |f| f.write last_response.body }
     assert last_response.body.include?('BadJob')
   end