sidekiq-failures 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 708163dea57e9c34fbaf279980cd23c56420415f
-  data.tar.gz: 1a8967ec4c7efc057fa48e2481601fc42980edf0
+  metadata.gz: 1e3a32d193a70834983a509cda264943a04cf76d
+  data.tar.gz: 946c4d36eab67ffd4b16b1e4e5dece3699be0f5a
 SHA512:
-  metadata.gz: d8bca52118ae7b792ac8387c25aad0662680b2797ab8fe0bd0b668986fe4643f26ddefc2200d33cbf4c662a85d16d1279f2ff33097ebaa502eddbd1da5413beb
-  data.tar.gz: 5ac567f23aa5f0e9f27769ca5223da6c4d08f4e6de981c398c87e6a3978706d543302370539d413f9023a7c504e0015b200f641a76f433fbc1ca7c058242c2d8
+  metadata.gz: 322bccce2ceacf773accdc94f9f693fc4c74286308aa2470cde98b731fedace3497514114161851194b074c44aa09179c36cc7824523297ad7b31da0480b2a05
+  data.tar.gz: ef0caebd8929b2f98bb1a7956bfea0b9806198bb72f29d3ee971e7381d44b68b8fea6766aba82c8c3813ec0ad41d9b4ea05b5da773aea4d9d60bd913922c082a

data/.gitignore

@@ -14,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock

data/.travis.yml

@@ -5,3 +5,10 @@ rvm:
   - 1.9.3
   - jruby-19mode
   - 2.0.0
+  - 2.1.0
+  - 2.1.1
+env:
+  matrix:
+    - SIDEKIQ_VERSION="~> 2.16.0"
+    - SIDEKIQ_VERSION="~> 2.17.0"
+    - SIDEKIQ_VERSION="~> 3.0.0"

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Unreleased
 
+## 0.4.0
+  * Bump sidekiq dependency to sidekiq >= 2.16.0
+  * Introduce delete(all) / retry(all) (@spectator)
+  * Fix Sidekiq 3 compatibility (@petergoldstein)
+  * Sidekiq 3 compatibility cleanup (@spectator)
+  * Explicitly require sidekiq/api (@krasnoukhov)
+
 ## 0.3.0
   * Bump sidekiq dependency to sidekiq >= 2.14.0
   * Remove slim templates and dependecy
@@ -8,7 +15,7 @@
   * Add `Sidekiq::Failures.count` helper method (@zanker)
   * Adhere to sidekiq approach of showing UTC times
   * Catch all exceptions, not just those that inherit from StandardError (@tylerkovacs)
-  * Fix pricate method call (@bwthomas)
+  * Fix private method call (@bwthomas)
 
 ## 0.2.2
   * Support ERB for sidekiq >= 2.14.0 (@tobiassvn)

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sidekiq-failures.gemspec
 gemspec
+
+gem 'sidekiq', ENV['SIDEKIQ_VERSION'] if ENV['SIDEKIQ_VERSION']

data/lib/sidekiq/failures.rb

@@ -4,7 +4,10 @@ rescue LoadError
   # client-only usage
 end
 
+require "sidekiq/api"
 require "sidekiq/failures/version"
+require "sidekiq/failures/sorted_entry"
+require "sidekiq/failures/failure_set"
 require "sidekiq/failures/middleware"
 require "sidekiq/failures/web_extension"
 
@@ -50,37 +53,27 @@ module Sidekiq
   end
 
   module Failures
-
     LIST_KEY = :failed
 
-    def self.reset_failures(options = {})
-      Sidekiq.redis { |c|
-        c.multi do
-          c.del(LIST_KEY)
-          c.set("stat:failed", 0) if options[:counter] || options["counter"]
-        end
-      }
+    def self.reset_failures
+      Sidekiq.redis { |c| c.set("stat:failed", 0) }
     end
 
     def self.count
-      Sidekiq.redis {|r| r.llen(LIST_KEY) }
+      Sidekiq.redis {|r| r.zcard(LIST_KEY) }
     end
   end
 end
 
 Sidekiq.configure_server do |config|
   config.server_middleware do |chain|
-    chain.add Sidekiq::Failures::Middleware
+    chain.insert_before Sidekiq::Middleware::Server::RetryJobs,
+                        Sidekiq::Failures::Middleware
   end
 end
 
 if defined?(Sidekiq::Web)
   Sidekiq::Web.register Sidekiq::Failures::WebExtension
-
-  if Sidekiq::Web.tabs.is_a?(Array)
-    # For sidekiq < 2.5
-    Sidekiq::Web.tabs << "failures"
-  else
-    Sidekiq::Web.tabs["Failures"] = "failures"
-  end
+  Sidekiq::Web.tabs["Failures"] = "failures"
+  Sidekiq::Web.settings.locales << File.join(File.dirname(__FILE__), "failures/locales")
 end

data/lib/sidekiq/failures/failure_set.rb

@@ -0,0 +1,22 @@
+module Sidekiq
+  module Failures
+    Superclass =
+      if defined?(Sidekiq::JobSet)
+        Sidekiq::JobSet
+      else
+        Sidekiq::SortedSet
+      end
+
+    class FailureSet < Superclass
+      def initialize
+        super LIST_KEY
+      end
+
+      def retry_all_failures
+        while size > 0
+          each(&:retry_failure)
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/failures/locales/en.yml

@@ -0,0 +1,5 @@
+en:
+  FailedJobs: Failed Jobs
+  FailedAt: Failed At
+  ResetCounter: Reset Counter
+  NoFailedJobsFound: No failed jobs found

data/lib/sidekiq/failures/middleware.rb

@@ -2,7 +2,6 @@ module Sidekiq
   module Failures
 
     class Middleware
-      include Sidekiq::Util
       attr_accessor :msg
 
       def call(worker, msg, queue)
@@ -13,21 +12,24 @@ module Sidekiq
       rescue Exception => e
         raise e if skip_failure?
 
-        data = {
-          :failed_at => Time.now.utc,
-          :payload => msg,
-          :exception => e.class.to_s,
-          :error => e.message,
-          :backtrace => e.backtrace,
-          :worker => msg['class'],
-          :processor => "#{hostname}:#{process_id}-#{Thread.current.object_id}",
-          :queue => queue
-        }
+        msg['error_message'] = e.message
+        msg['error_class'] = e.class.name
+        msg['processor'] = identity
+        msg['failed_at'] = Time.now.utc.to_f
 
+        if msg['backtrace'] == true
+          msg['error_backtrace'] = e.backtrace
+        elsif msg['backtrace'] == false
+          # do nothing
+        elsif msg['backtrace'].to_i != 0
+          msg['error_backtrace'] = e.backtrace[0..msg['backtrace'].to_i]
+        end
+
+        payload = Sidekiq.dump_json(msg)
         Sidekiq.redis do |conn|
-          conn.lpush(LIST_KEY, Sidekiq.dump_json(data))
+          conn.zadd(LIST_KEY, Time.now.utc.to_f, payload)
           unless Sidekiq.failures_max_count == false
-            conn.ltrim(LIST_KEY, 0, Sidekiq.failures_max_count - 1)
+            conn.zremrangebyrank(LIST_KEY, 0, -(Sidekiq.failures_max_count + 1))
           end
         end
 
@@ -36,12 +38,16 @@ module Sidekiq
 
       private
 
-      def skip_failure?
-        failure_mode == :off || not_exhausted?
+      def failure_mode_off?
+        failure_mode == :off
       end
 
-      def not_exhausted?
-        failure_mode == :exhausted && !last_try?
+      def failure_mode_exhausted?
+        failure_mode == :exhausted
+      end
+
+      def skip_failure?
+        failure_mode_off? || failure_mode_exhausted? && !exhausted?
       end
 
       def failure_mode
@@ -57,8 +63,12 @@ module Sidekiq
         end
       end
 
-      def last_try?
-        ! msg['retry'] || retry_count == max_retries - 1
+      def exhausted?
+        !retriable? || retry_count >= max_retries
+      end
+
+      def retriable?
+        msg['retry']
       end
 
       def retry_count
@@ -76,6 +86,14 @@ module Sidekiq
       def default_max_retries
         Sidekiq::Middleware::Server::RetryJobs::DEFAULT_MAX_RETRY_ATTEMPTS
       end
+
+      def hostname
+        Socket.gethostname
+      end
+
+      def identity
+        @@identity ||= "#{hostname}:#{$$}"
+      end
     end
   end
 end

data/lib/sidekiq/failures/sorted_entry.rb

@@ -0,0 +1,14 @@
+module Sidekiq
+  class SortedEntry
+    def retry_failure
+      Sidekiq.redis do |conn|
+        results = conn.zrangebyscore(Sidekiq::Failures::LIST_KEY, score, score)
+        conn.zremrangebyscore(Sidekiq::Failures::LIST_KEY, score, score)
+        results.map do |message|
+          msg = Sidekiq.load_json(message)
+          Sidekiq::Client.push(msg)
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/failures/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Failures
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/sidekiq/failures/views/failure.erb

@@ -0,0 +1,30 @@
+<%= erb :_job_info, :locals => {:job => @failure, :type => :failure} %>
+
+<h3><%= t('Error') %></h3>
+<table class="error table table-bordered table-striped">
+  <tbody>
+    <tr>
+      <th><%= t('ErrorClass') %></th>
+      <td>
+        <code><%= @failure['error_class'] %></code>
+      </td>
+    </tr>
+    <tr>
+      <th><%= t('ErrorMessage') %></th>
+      <td><%= @failure['error_message'] %></td>
+    </tr>
+    <% if !@failure['error_backtrace'].nil? %>
+      <tr>
+        <th><%= t('ErrorBacktrace') %></th>
+        <td>
+          <code><%= @failure['error_backtrace'].join("<br/>") %></code>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+<form class="form-horizontal" action="<%= root_path %>failures/<%= job_params(@failure, @failure.score) %>" method="post">
+  <a class="btn" href="<%= root_path %>failures"><%= t('GoBack') %></a>
+  <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
+  <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />
+</form>

data/lib/sidekiq/failures/views/failures.erb

@@ -1,58 +1,75 @@
 <header class="row">
-  <div class="span5">
-    <h3>Failed Jobs</h3>
-  </div>
-  <div class="span4">
-    <% if @messages.size > 0 %>
-      <%= erb :_paging, :locals => { :url => "#{root_path}failures#@name" } %>
-    <% end %>
+  <div class="col-sm-5">
+    <h3><%= t('FailedJobs') %></h3>
   </div>
+  <% if @failures.size > 0 && @total_size > @count %>
+    <div class="col-sm-4">
+      <%= erb :_paging, :locals => { :url => "#{root_path}failures" } %>
+    </div>
+  <% end %>
+  <%= filtering('failures') if respond_to?(:filtering) %>
 </header>
 
-<% if @messages.size > 0 %>
-  <table class="table table-striped table-bordered table-white" style="width: 100%; margin: 0; table-layout:fixed;">
-    <thead>
-      <th style="width: 25%">Worker, Args</th>
-      <th style="width: 10%">Queue</th>
-      <th style="width: 15%">Failed At</th>
-      <th style="width: 50%">Exception</th>
-    </thead>
-    <% @messages.each do |msg| %>
-      <tr>
-        <td style="overflow: hidden; text-overflow: ellipsis;">
-          <%= msg['worker'] %>
-          <br />
-          <%= msg['payload']['args'].inspect[0..100] %>
-        </td>
-        <td><%= msg['queue'] %></td>
-        <td>
-          <%= relative_time(Time.parse(msg['failed_at'])) %>
-        </td>
-        <td style="overflow: auto; padding: 10px;">
-          <a class="backtrace" href="#" onclick="$(this).next().toggle(); return false">
-            <%= h msg['exception'] %>: <%= h msg['error'] %>
-          </a>
-          <pre style="display: none; background: none; border: 0; width: 100%; max-height: 30em; font-size: 0.8em; white-space: nowrap;">
-            <%= msg['backtrace'].join("<br />") %>
-          </pre>
-          <p>
-            <span>Processor: <%= msg['processor'] %></span>
-          </p>
-        </td>
-      </tr>
-    <% end %>
-  </table>
-  <div class="row">
-    <div class="span5">
-      <form class="form-inline" action="<%= "#{root_path}failures/remove" %>" method="post" style="margin: 20px 0">
-        <input class="btn btn-danger btn-small" type="submit" name="delete" value="Clear All" />
-        <label class="checkbox">
-          <input type="checkbox" name="counter" value="true" />
-          reset failed counter
-        </label>
-      </form>
-    </div>
-  </div>
+<% if @failures.size > 0 %>
+  <form action="<%= root_path %>failures" method="post">
+    <table class="table table-striped table-bordered table-white">
+      <thead>
+        <tr>
+          <th width="20px" class="table-checkbox">
+            <label>
+              <input type="checkbox" class="check_all" />
+            </label>
+          </th>
+          <th style="width: 20%"><%= t('Worker') %></th>
+          <th style="width: 10%"><%= t('Arguments') %></th>
+          <th style="width: 10%"><%= t('Queue') %></th>
+          <th style="width: 10%"><%= t('FailedAt') %></th>
+          <th style="width: 50%"><%= t('Error') %></th>
+        </tr>
+      </thead>
+      <% @failures.each do |entry| %>
+        <tr>
+          <td class="table-checkbox">
+            <label>
+              <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
+            </label>
+          </td>
+          <td><a href="<%= root_path %>failures/<%= job_params(entry.item, entry.score) %>"><%= entry.klass %></a></td>
+          <td>
+            <div class="args"><%= display_args(entry.args) %></div>
+          </td>
+          <td>
+            <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
+          </td>
+          <td><%= relative_time(Time.at(entry['failed_at'])) %></td>
+          <td style="overflow: auto; padding: 10px;">
+            <a class="backtrace" href="#" onclick="$(this).next().toggle(); return false">
+              <%= h entry['error_class'] %>: <%= h entry['error_message'] %>
+            </a>
+            <pre style="display: none; background: none; border: 0; width: 100%; max-height: 30em; font-size: 0.8em; white-space: nowrap;">
+              <%= entry['error_backtrace'].join("<br />") if entry['error_backtrace'] %>
+            </pre>
+            <p>
+              <span>Processor: <%= entry['processor'] %></span>
+            </p>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+    <input class="btn btn-primary btn-xs pull-left" type="submit" name="retry" value="<%= t('RetryNow') %>" />
+    <input class="btn btn-danger btn-xs pull-left" type="submit" name="delete" value="<%= t('Delete') %>" />
+  </form>
+
+  <form action="<%= root_path %>failures/all/reset" method="post">
+    <input class="btn btn-danger btn-xs pull-right" type="submit" name="reset" value="<%= t('Reset Counter') %>" data-confirm="<%= t('AreYouSure') %>" />
+  </form>
+  <form action="<%= root_path %>failures/all/delete" method="post">
+    <input class="btn btn-danger btn-xs pull-right" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+  </form>
+  <form action="<%= root_path %>failures/all/retry" method="post">
+    <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+  </form>
+
 <% else %>
-  <div class="alert alert-success">No failed jobs found.</div>
+  <div class="alert alert-success"><%= t('NoFailedJobsFound') %></div>
 <% end %>

data/lib/sidekiq/failures/web_extension.rb

@@ -3,19 +3,67 @@ module Sidekiq
     module WebExtension
 
       def self.registered(app)
-        app.get "/failures" do
-          view_path = File.join(File.expand_path("..", __FILE__), "views")
+        view_path = File.join(File.expand_path("..", __FILE__), "views")
 
+        app.get "/failures" do
           @count = (params[:count] || 25).to_i
-          (@current_page, @total_size, @messages) = page("failed", params[:page], @count)
-          @messages = @messages.map { |msg| Sidekiq.load_json(msg) }
+          (@current_page, @total_size, @failures) = page(LIST_KEY, params[:page], @count)
+          @failures = @failures.map {|msg, score| Sidekiq::SortedEntry.new(nil, score, msg) }
 
           render(:erb, File.read(File.join(view_path, "failures.erb")))
         end
 
-        app.post "/failures/remove" do
-          Sidekiq::Failures.reset_failures(counter: params["counter"])
+        app.get "/failures/:key" do
+          halt 404 unless params['key']
+
+          @failure = FailureSet.new.fetch(*parse_params(params['key'])).first
+          redirect "#{root_path}failures" if @failure.nil?
+          render(:erb, File.read(File.join(view_path, "failure.erb")))
+        end
+
+        app.post "/failures" do
+          halt 404 unless params['key']
+
+          params['key'].each do |key|
+            job = FailureSet.new.fetch(*parse_params(key)).first
+            next unless job
+
+            if params['retry']
+              job.retry_failure
+            elsif params['delete']
+              job.delete
+            end
+          end
+
+          redirect_with_query("#{root_path}failures")
+        end
+
+        app.post "/failures/:key" do
+          halt 404 unless params['key']
+
+          job = FailureSet.new.fetch(*parse_params(params['key'])).first
+          if job
+            if params['retry']
+              job.retry_failure
+            elsif params['delete']
+              job.delete
+            end
+          end
+          redirect_with_query("#{root_path}failures")
+        end
+
+        app.post "/failures/all/reset" do
+          Sidekiq::Failures.reset_failures
+          redirect "#{root_path}failures"
+        end
+
+        app.post "/failures/all/delete" do
+          FailureSet.new.clear
+          redirect "#{root_path}failures"
+        end
 
+        app.post "/failures/all/retry" do
+          FailureSet.new.retry_all_failures
           redirect "#{root_path}failures"
         end
       end

data/sidekiq-failures.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Sidekiq::Failures::VERSION
 
-  gem.add_dependency "sidekiq", ">= 2.14.0"
+  gem.add_dependency "sidekiq", ">= 2.16.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rack-test"

data/test/middleware_test.rb

@@ -148,7 +148,7 @@ module Sidekiq
       end
 
       it "records failure if failing last retry and configured to track exhaustion" do
-        msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry' => true, 'retry_count' => 24, 'failures' => 'exhausted')
+        msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry' => true, 'retry_count' => 25, 'failures' => 'exhausted')
 
         assert_equal 0, failures_count
 
@@ -206,7 +206,7 @@ module Sidekiq
       it "records failure if failing last retry and configured to track exhaustion by default" do
         Sidekiq.failures_default_mode = 'exhausted'
 
-        msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry' => true, 'retry_count' => 24)
+        msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry' => true, 'retry_count' => 25)
 
         assert_equal 0, failures_count
 
@@ -272,7 +272,7 @@ module Sidekiq
       end
 
       def failures_count
-        Sidekiq.redis { |conn|conn.llen('failed') } || 0
+        Sidekiq.redis { |conn| conn.zcard(LIST_KEY) }
       end
 
       def create_work(msg)

data/test/web_extension_test.rb

@@ -46,19 +46,38 @@ module Sidekiq
         last_response.body.wont_match /No failed jobs found/
       end
 
-      it 'has the clear all form and action' do
-        last_response.body.must_match /failures\/remove/
-        last_response.body.must_match /method=\"post/
-        last_response.body.must_match /Clear All/
-        last_response.body.must_match /reset failed counter/
+      it 'has the reset counter form and action' do
+        last_response.body.must_match /failures\/all\/reset/
+        last_response.body.must_match /Reset Counter/
       end
 
-      it 'can remove all failures without clearing counter' do
+      it 'can reset counter' do
         assert_equal failed_count, "1"
 
         last_response.body.must_match /HardWorker/
 
-        post '/failures/remove'
+        post '/failures/all/reset'
+        last_response.status.must_equal 302
+        last_response.location.must_match /failures$/
+
+        get '/failures'
+        last_response.status.must_equal 200
+        last_response.body.must_match /HardWorker/
+
+        assert_equal failed_count, "0"
+      end
+
+      it 'has the delete all form and action' do
+        last_response.body.must_match /failures\/all\/delete/
+        last_response.body.must_match /Delete All/
+      end
+
+      it 'can delete all failures' do
+        assert_equal failed_count, "1"
+
+        last_response.body.must_match /HardWorker/
+
+        post '/failures/all/delete'
         last_response.status.must_equal 302
         last_response.location.must_match /failures$/
 
@@ -69,37 +88,111 @@ module Sidekiq
         assert_equal failed_count, "1"
       end
 
-      it 'can remove all failures and clear counter' do
+      it 'has the retry all form and action' do
+        last_response.body.must_match /failures\/all\/retry/
+        last_response.body.must_match /Retry All/
+      end
+
+      it 'can retry all failures' do
+        assert_equal failed_count, "1"
+
+        last_response.body.must_match /HardWorker/
+        post '/failures/all/retry'
+        last_response.status.must_equal 302
+        last_response.location.must_match /failures/
+
+        get '/failures'
+        last_response.status.must_equal 200
+        last_response.body.must_match(/No failed jobs found/)
+      end
+
+      it 'can delete failure from the list' do
         assert_equal failed_count, "1"
 
         last_response.body.must_match /HardWorker/
 
-        post '/failures/remove', counter: "true"
+        post '/failures', { :key => [failure_score], :delete => 'Delete' }
         last_response.status.must_equal 302
-        last_response.location.must_match /failures$/
+        last_response.location.must_match /failures/
 
         get '/failures'
         last_response.status.must_equal 200
         last_response.body.must_match /No failed jobs found/
+      end
 
-        assert_equal failed_count, "0"
+      it 'can retry failure from the list' do
+        assert_equal failed_count, "1"
+
+        last_response.body.must_match /HardWorker/
+
+        post '/failures', { :key => [failure_score], :retry => 'Retry Now' }
+        last_response.status.must_equal 302
+        last_response.location.must_match /failures/
+
+        get '/failures'
+        last_response.status.must_equal 200
+        last_response.body.must_match /No failed jobs found/
+      end
+    end
+
+    describe 'when there is failure' do
+      before do
+        create_sample_failure
+        get "/failures/#{failure_score}"
+      end
+
+      it 'should be successful' do
+        last_response.status.must_equal 200
+      end
+
+      it 'can display failure page' do
+        last_response.body.must_match /Job/
+        last_response.body.must_match /HardWorker/
+        last_response.body.must_match /ArgumentError/
+        last_response.body.must_match /file1/
+      end
+
+      it 'can delete failure' do
+        last_response.body.must_match /HardWorker/
+
+        post "/failures/#{failure_score}", :delete => 'Delete'
+        last_response.status.must_equal 302
+        last_response.location.must_match /failures/
+
+        get "/failures/#{failure_score}"
+        last_response.status.must_equal 302
+        last_response.location.must_match /failures/
+      end
+
+      it 'can retry failure' do
+        last_response.body.must_match /HardWorker/
+
+        post "/failures/#{failure_score}", :retry => 'Retry Now'
+        last_response.status.must_equal 302
+        last_response.location.must_match /failures/
+
+        get "/failures/#{failure_score}"
+        last_response.status.must_equal 302
+        last_response.location.must_match /failures/
       end
     end
 
     def create_sample_failure
       data = {
-        :failed_at => Time.now.strftime("%Y/%m/%d %H:%M:%S %Z"),
-        :payload => { :args => ["bob", 5] },
-        :exception => "ArgumentError",
-        :error => "Some new message",
-        :backtrace => ["path/file1.rb", "path/file2.rb"],
-        :worker => 'HardWorker',
-        :queue => 'default'
+        :queue => 'default',
+        :class => 'HardWorker',
+        :args  => ['bob', 5],
+        :jid   => 1,
+        :enqueued_at     => Time.now.utc.to_f,
+        :failed_at       => Time.now.utc.to_f,
+        :error_class     => 'ArgumentError',
+        :error_message   => 'Some new message',
+        :error_backtrace => ["path/file1.rb", "path/file2.rb"]
       }
 
       Sidekiq.redis do |c|
         c.multi do
-          c.rpush("failed", Sidekiq.dump_json(data))
+          c.zadd(Sidekiq::Failures::LIST_KEY, failure_score, Sidekiq.dump_json(data))
           c.set("stat:failed", 1)
         end
       end
@@ -108,5 +201,9 @@ module Sidekiq
     def failed_count
       Sidekiq.redis { |c| c.get("stat:failed") }
     end
+
+    def failure_score
+      Time.at(1).to_f
+    end
   end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-failures
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Marcelo Silveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.16.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Keep track of Sidekiq failed jobs
@@ -87,18 +87,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - lib/sidekiq-failures.rb
 - lib/sidekiq/failures.rb
+- lib/sidekiq/failures/failure_set.rb
+- lib/sidekiq/failures/locales/en.yml
 - lib/sidekiq/failures/middleware.rb
+- lib/sidekiq/failures/sorted_entry.rb
 - lib/sidekiq/failures/version.rb
+- lib/sidekiq/failures/views/failure.erb
 - lib/sidekiq/failures/views/failures.erb
 - lib/sidekiq/failures/web_extension.rb
 - sidekiq-failures.gemspec
@@ -114,17 +117,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Keeps track of Sidekiq failed jobs and adds a tab to the Web UI to let you

data/Gemfile.lock

@@ -1,51 +0,0 @@
-PATH
-  remote: .
-  specs:
-    sidekiq-failures (0.3.0)
-      sidekiq (>= 2.14.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    connection_pool (1.2.0)
-    hike (1.2.1)
-    json (1.8.1)
-    multi_json (1.7.3)
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (0.9.2.2)
-    redis (3.0.6)
-    redis-namespace (1.3.2)
-      redis (~> 3.0.4)
-    sidekiq (2.17.0)
-      celluloid (>= 0.15.2)
-      connection_pool (>= 1.0.0)
-      json
-      redis (>= 3.0.4)
-      redis-namespace (>= 1.3.1)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.8.1)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
-    timers (1.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rack-test
-  rake
-  sidekiq-failures!
-  sinatra
-  sprockets