Merge pull request #2 from MorphoSource/ms_updates2

Query jobs by job class or exception, retry jobs by job class

Author: JulieWinchester

app/controllers/resque_web/failures_controller.rb

@@ -56,6 +56,24 @@ def retry_all_for_exception
       redirect_to failures_path(redirect_params)
     end
 
+    def retry_all_for_job_class
+      if params[:job_class].present?
+        job_class = params[:job_class]
+        job_ids = []
+
+        Resque::Failure.each(0, Resque::Failure.count, params[:queue] || 'failed') do |id, item|
+          if item['payload'] && item['payload']['args'] && item['payload']['args']&.first['job_class'] == job_class
+            job_ids << id
+          end
+        end
+
+        job_ids.sort.reverse.map { |id| reque_single_job(id) }
+      else
+        flash[:error] = "No job class specified for retrying failures."
+      end
+      redirect_to failures_path(redirect_params)
+    end
+
     private
 
     #API agnostic for Resque 2 with duck typing on requeue_and_remove

app/helpers/resque_web/failures_helper.rb

@@ -1,7 +1,46 @@
 module ResqueWeb
   module FailuresHelper
+    # If job_class or exception params present, need to set up data differently
+    def initialize_failure_data
+      if params[:job_class].present? || params[:exception].present?
+        query_matching_failures
+        @failure_size = @failures.count
+      end
+    end
+
+    def query_matching_failures
+      @failures = []
+      Resque::Failure.each(0, Resque::Failure.count, params[:queue] || 'failed', params[:class]) do |id, item|
+        matches_conditions = true
+
+        if params[:exception].present?
+          if item['exception'] != params[:exception]
+            matches_conditions = false
+          end
+        end
+
+        if params[:job_class].present?
+          item_job_class = ( item.dig('payload', 'args')&.first || {} )['job_class']
+          if item_job_class.present? && item_job_class != params[:job_class]
+            matches_conditions = false
+          end
+        end
+
+        if matches_conditions == true
+          @failures << [id, item]
+        end
+      end
+    end
+
     def each_failure(&block)
-      Resque::Failure.each(failure_start_at, failure_per_page, params[:queue], params[:class], 'asc', &block)
+      if params[:job_class].present? || params[:exception].present?
+        query_matching_failures if @failures.nil?
+        failures_page = @failures.slice(failure_start_at, failure_per_page) || []
+        failures_page.each &block
+      else
+        # default case, use standard Resque library
+        Resque::Failure.each(failure_start_at, failure_per_page, params[:queue], params[:class], &block)
+      end
     end
 
     def failure_date_format
@@ -29,14 +68,16 @@ def failure_per_page
     end
 
     def failure_start_at
-      params[:start].to_i
+      @failure_start_at ||= params[:start].to_i
     end
 
     def failure_end_at
-      if failure_start_at + failure_per_page > failure_size
-        failure_size
-      else
-        failure_start_at + failure_per_page
+      @failure_end_at ||= begin
+        if failure_start_at + failure_per_page > failure_size
+          failure_size
+        else
+          failure_start_at + failure_per_page
+        end
       end
     end
 

app/views/resque_web/failures/_failed_job.html.erb

@@ -26,20 +26,39 @@
     <dt>Class</dt>
     <dd>
       <% if job['payload'] && job['payload']['class'] %>
-        <%= link_to failures_path(:class=>job['payload']['class'],:queue=>params[:queue]) do %>
+        <%= link_to failures_path(:class=>job['payload']['class'], :queue=>params[:queue]) do %>
           <code><%= job['payload']['class'] %></code>
         <% end %>
       <% else %>
         <code>nil</code>
       <% end %>
     </dd>
+    <dt>Job Class</dt>
+    <dd>
+      <% if job['payload'] && job['payload']['args'] && job['payload']['args']&.first['job_class'] %>
+        <%= link_to failures_path(:class=>job['payload']['class'], :queue=>params[:queue], :job_class=>job['payload']['args']&.first['job_class']) do %>
+          <code><%= job['payload']['args']&.first['job_class'] %></code>
+        <% end %>
+      <% else %>
+        <code>nil</code>
+      <% end %>
+      <%= form_tag(retry_all_for_job_class_failures_path(job_class: job['payload']['args']&.first['job_class'].to_s), method: :put, style: 'margin-top: 0;') do %>
+        <%= submit_tag "Retry All Jobs Of This Class", data: { confirm: "Are you sure you want to retry ALL #{failure_queue_name.downcase} jobs with this class?" } %>
+      <% end %>
+    </dd>
     <dt>Arguments</dt>
     <dd><pre><%= job_arguments(job) %></pre></dd>
     <dt>Exception</dt>
     <dd>
-      <code><%= job['exception'] %></code>
+      <% if job['exception'] %>
+        <%= link_to failures_path(:class=>job['payload']['class'], :queue=>params[:queue], :exception=>job['exception']) do %>
+          <code><%= job['exception'] %></code>
+        <% end %>
+      <% else %>
+        <code>nil</code>
+      <% end %>
       <%= form_tag(retry_all_for_exception_failures_path(exception: job['exception'].to_s), method: :put, style: 'margin-top: 0;') do %>
-        <%= submit_tag "Retry All Jobs with Exception", data: { confirm: "Are you sure you want to retry ALL #{failure_queue_name.downcase} jobs with this exception?" } %>
+        <%= submit_tag "Retry All Jobs With Exception", data: { confirm: "Are you sure you want to retry ALL #{failure_queue_name.downcase} jobs with this exception?" } %>
       <% end %>
     </dd>
     <dt>Error</dt>

app/views/resque_web/failures/index.html.erb

@@ -1,7 +1,16 @@
+<% initialize_failure_data %>
 <% if multiple_failure_queues? && !params[:queue] %>
   <h1>All Failure Queues</h1>
 <% else %>
-  <h1>Failed Jobs <%= "on '#{params[:queue]}'" if params[:queue] %> <%= "with class '#{params[:class]}'" if params[:class] %></h1>
+  <% if params[:job_class] %>
+    <h1>Failed Jobs <%= "on '#{params[:queue]}'" if params[:queue] %> <%= "with job class '#{params[:job_class]}'" %></h1>
+  <% elsif params[:exception] %>
+    <h1>Failed Jobs <%= "on '#{params[:queue]}'" if params[:queue] %> <%= "with exception '#{params[:exception]}'" %></h1>
+  <% elsif params[:class] %>
+    <h1>Failed Jobs <%= "on '#{params[:queue]}'" if params[:queue] %> <%= "with class '#{params[:class]}'" %></h1>
+  <% else %>
+    <h1>Failed Jobs <%= "on '#{params[:queue]}'" if params[:queue] %></h1>
+  <% end %>
 <% end %>
 
 <% unless failure_size.zero? %>

config/routes.rb

@@ -22,6 +22,7 @@
     collection do
       put 'retry_all'
       put 'retry_all_for_exception'
+      put 'retry_all_for_job_class'
       delete 'destroy_all'
     end
   end