Merge pull request #1 from MorphoSource/ms_updates

Adds functionality and fixes issues with failed jobs list

Author: JulieWinchester

app/assets/stylesheets/resque_web/bootstrap_and_overrides.css.scss.erb

@@ -123,9 +123,9 @@ body {
 .container ul.failed li dl dt {font-size:80%; color:#999; width:60px; float:left; padding-top:1px; text-align:right;}
 .container ul.failed li dl dd {margin-bottom:10px; margin-left:70px;}
 .container ul.failed li dl dd .retried { float:right; text-align: right; }
-.container ul.failed li dl dd .retried .remove { display:none; margin-top: 8px; }
+.container ul.failed li dl dd .retried .remove { margin-top: 8px; }
 .container ul.failed li.hover dl dd .retried .remove { display:block; }
-.container ul.failed li dl dd .controls { display:none; float:right; }
+.container ul.failed li dl dd .controls { float:right; }
 .container ul.failed li.hover dl dd .controls { display:block; }
 .container ul.failed li dl dd code, .container ul.failed li dl dd pre { font-family:Monaco, "Courier New", monospace; font-size:90%; white-space: pre-wrap;}
 .container ul.failed li dl dd.error a {font-family:Monaco, "Courier New", monospace; font-size:90%; }

app/controllers/resque_web/failures_controller.rb

@@ -38,6 +38,24 @@ def retry_all
       redirect_to failures_path(redirect_params)
     end
 
+    def retry_all_for_exception
+      if params[:exception].present?
+        exception = params[:exception]
+        job_ids = []
+
+        Resque::Failure.each(0, Resque::Failure.count, params[:queue] || 'failed') do |id, item|
+          if item['exception'] == exception
+            job_ids << id
+          end
+        end
+
+        job_ids.sort.reverse.map { |id| reque_single_job(id) }
+      else
+        flash[:error] = "No exception 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/application_helper.rb

@@ -43,6 +43,7 @@ def pagination(options = {})
       start    = options[:start] || 1
       per_page = options[:per_page] || PER_PAGE
       total    = options[:total] || 0
+      span_tag = options[:span_tag]
       return if total < per_page
 
       markup = ""
@@ -54,7 +55,7 @@ def pagination(options = {})
         markup << link_to(raw("more &raquo;"), params.permit!.merge(:start => start + per_page), :class => 'btn more')
       end
 
-      content_tag :p, raw(markup), :class => 'pagination'
+      content_tag (span_tag ? :span : :p), raw(markup), :class => (span_tag ? '' : 'pagination')
     end
 
     def poll(polling=false)

app/helpers/resque_web/failures_helper.rb

@@ -1,7 +1,7 @@
 module ResqueWeb
   module FailuresHelper
     def each_failure(&block)
-      Resque::Failure.each(failure_start_at, failure_per_page, params[:queue], params[:class], &block)
+      Resque::Failure.each(failure_start_at, failure_per_page, params[:queue], params[:class], 'asc', &block)
     end
 
     def failure_date_format

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

@@ -7,7 +7,7 @@
     <dt>Worker</dt>
     <dd>
       <%= job['worker'].split(':')[0...2].join(':') %>
-      on <b class="label label-info"><%= job['queue'] %></b >
+      on <b class="label label-info"><%= job['queue'] %></b>
       at <b><span class="time"><%= Time.parse(job['failed_at']).strftime(failure_date_format) %></span></b>
 
       <% if job['retried_at'] %>
@@ -36,7 +36,12 @@
     <dt>Arguments</dt>
     <dd><pre><%= job_arguments(job) %></pre></dd>
     <dt>Exception</dt>
-    <dd><code><%= job['exception'] %></code></dd>
+    <dd>
+      <code><%= job['exception'] %></code>
+      <%= 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?" } %>
+      <% end %>
+    </dd>
     <dt>Error</dt>
     <dd class="error">
       <% if job['backtrace'] %>

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

@@ -8,6 +8,7 @@
   <%= form_tag(destroy_all_failures_path(queue: params[:queue]), method: :delete) do %>
     <%= submit_tag "Clear #{failure_queue_name} Jobs", class: 'btn btn-danger', data: { confirm: "Are you sure you want to clear ALL #{failure_queue_name.downcase} jobs?" } %>
     <% if failure_size > failure_per_page %>
+      <%= pagination(start: failure_start_at, total: failure_size, span_tag: true) unless params[:class] %>
       <%= link_to "Last page &raquo;".html_safe, { start: (failure_size - failure_per_page) }, class: 'btn' %>
     <% end %>
   <% end %>
@@ -17,7 +18,7 @@
 <% end %>
 
 <% if multiple_failure_queues? && !params[:queue] %>
-  <p class="sub"><b><%= Resque::Failure.queues.size %></b> failure queues total</sub>
+  <p class="sub"><b><%= Resque::Failure.queues.size %></b> failure queues total</p>
   <%= render partial: 'overview' %>
 <% else %>
   <p class="sub">Showing <%= failure_start_at %> to <%= failure_end_at %> of <b><%= failure_size %></b> jobs</p>

config/routes.rb

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