Merge pull request resque#703 from KensoDev/feature/requeue_and_remove

Requeue and remove

Author: steveklabnik

HISTORY.md

@@ -1,3 +1,7 @@
+## Unreleased
+
+* Changed failures retry process to requeue. (@KensoDev #703)
+
 ## 1.21.0 (2012-07-02)
 
 * Add a flag to make sure failure hooks are only ran once (jakemack, #546)

lib/resque/failure.rb

@@ -63,6 +63,11 @@ def self.requeue(index)
       backend.requeue(index)
     end
 
+    def self.requeue_and_remove(index)
+      backend.requeue(index)
+      backend.remove(index)
+    end
+
     def self.requeue_to(index, queue_name)
       backend.requeue(index, queue_name)
     end

lib/resque/server.rb

@@ -192,13 +192,14 @@ def show_for_polling(page)
 
     post "/failed/requeue/all" do
       Resque::Failure.count.times do |num|
-        Resque::Failure.requeue(num)
+        Resque::Failure.requeue_and_remove(num)
       end
       redirect u('failed')
     end
 
     get "/failed/requeue/:index/?" do
-      Resque::Failure.requeue(params[:index])
+      Resque::Failure.requeue_and_remove(params[:index])
+
       if request.xhr?
         return Resque::Failure.all(params[:index])['retried_at']
       else

lib/resque/server/views/failed.erb

@@ -10,7 +10,7 @@
   <input type='submit' name='' value='Clear Failed Jobs' id="clear-failed-jobs" />
 </form>
 <form method="POST" action="<%=u 'failed/requeue/all'%>">
-  <input type='submit' name='' value='Retry Failed Jobs' id="retry-failed-jobs"  />
+  <input type='submit' name='' value='Requeue Failed Jobs' id="retry-failed-jobs"  />
 </form>
 <%end%>
 
@@ -35,7 +35,7 @@
             </div>
           <% else %>
             <div class='controls'>
-              <a href="<%= u "failed/requeue/#{start + index - 1}" %>" rel="retry">Retry</a>
+              <a href="<%= u "failed/requeue/#{start + index - 1}" %>" rel="retry">Requeue</a>
               or
               <a href="<%= u "failed/remove/#{start + index - 1}" %>" rel="remove">Remove</a>
             </div>