Fully functional retry item removal

morellon · Dec 28, 2010 · 138bb41 · 138bb41
1 parent e4dc9ff
commit 138bb41
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/lib/resque-retry/server.rb b/lib/resque-retry/server.rb
@@ -36,10 +36,9 @@ def local_template(path)
  def cancel_retry(job)
  klass = Resque.constantize(job['class'])
  retry_key = retry_key_for_job(job)
- puts retry_key
- puts Resque.remove_delayed(klass, job['args'])
- puts Resque.redis.del("failure_#{retry_key}")
- puts Resque.redis.del(retry_key)
+ Resque.remove_delayed(klass, *job["args"])
+ Resque.redis.del("failure_#{retry_key}")
+ Resque.redis.del(retry_key)
  end
  end
 
@@ -51,10 +50,10 @@ def cancel_retry(job)
  erb local_template('retry_timestamp.erb')
  end
 
- get "/retry/:timestamp/jobs/:id/remove" do
+ post "/retry/:timestamp/jobs/:id/remove" do
  job = Resque.decode(params[:id])
  cancel_retry(job)
- redirect u('retry')
+ redirect u("retry/#{params[:timestamp]}")
  end
  }
  end

diff --git a/lib/resque-retry/server/views/retry.erb b/lib/resque-retry/server/views/retry.erb
@@ -21,7 +21,7 @@
  </tr>
  <% timestamps = resque.delayed_queue_peek(start, start+20) %>
  <% timestamps.each do |timestamp| %>
- <% job = resque.delayed_timestamp_peek(timestamp, 0, 1).first %>
+ <% job = resque.delayed_timestamp_peek(timestamp, 0, 1).first || {} %>
  <% retry_key = retry_key_for_job(job) %>
  <tr>
  <td>

diff --git a/lib/resque-retry/server/views/retry_timestamp.erb b/lib/resque-retry/server/views/retry_timestamp.erb
@@ -46,12 +46,17 @@
  <% end %>
  </td>
  <% end %>
- <td><a href="<%= url "retry/#{timestamp}/jobs/#{CGI.escape(Resque.encode(job))}/remove" %>" class="remove">Remove</a></td>
+ <td>
+ <form action="<%= url "retry/#{timestamp}/jobs/#{CGI.escape(Resque.encode(job))}/remove" %>" method="post">
+ <input type="hidden" name="timestamp" value="<%= timestamp.to_i %>">
+ <input type="submit" value="Remove">
+ </form>
+ </td>
  </tr>
  <% end %>
  <% if jobs.empty? %>
  <tr>
- <td class="no-data" colspan="5">
+ <td class="no-data" colspan="6">
  There are no pending jobs scheduled for this time.
  </td>
  </tr>