sidekiq-failures 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
 
+## 0.2.2
+  * Support ERB for sidekiq >= 2.14.0 (@tobiassvn)
+  * Bump sidekiq dep to >= 2.9.0
+  * Show newest failures first (@PlugIN73)
+  * Fix specs (@krasnoukhov)
+
 ## 0.2.1
   * Fix exhausted mode when retry is disabled (@wr0ngway)
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    sidekiq-failures (0.2.1)
-      sidekiq (>= 2.2.1)
+    sidekiq-failures (0.2.2)
+      sidekiq (>= 2.9.0)
 
 GEM
   remote: https://rubygems.org/
@@ -20,9 +20,9 @@ GEM
       rack (>= 1.0)
     rake (0.9.2.2)
     redis (3.0.4)
-    redis-namespace (1.3.0)
+    redis-namespace (1.3.1)
       redis (~> 3.0.0)
-    sidekiq (2.12.4)
+    sidekiq (2.13.0)
       celluloid (>= 0.14.1)
       connection_pool (>= 1.0.0)
       json

data/README.md

@@ -24,8 +24,8 @@ jobs will be visible via a Failures tab in the Web UI.
 
 ### Maximum Tracked Failures
 
-Since each failed job/retry creates a new failure entry that will only be removed 
-by you manually, your failures list might consume more resources than you have 
+Since each failed job/retry creates a new failure entry that will only be removed
+by you manually, your failures list might consume more resources than you have
 available.
 
 To avoid this sidekiq-failures adopts a default of 1000 maximum tracked failures.
@@ -115,11 +115,7 @@ The valid modes are `:all`, `:exhausted` or `:off`.
 
 ## Dependencies
 
-Depends on Sidekiq >= 2.2.1
-
-## TODO
-
-* Allow triggering retry of specific failed jobs via Web UI.
+Depends on Sidekiq >= 2.9.0
 
 ## Contributing
 

data/lib/sidekiq/failures/middleware.rb

@@ -25,9 +25,9 @@ module Sidekiq
         }
 
         Sidekiq.redis do |conn|
-          conn.rpush(:failed, Sidekiq.dump_json(data))
+          conn.lpush(:failed, Sidekiq.dump_json(data))
           unless Sidekiq.failures_max_count == false
-            conn.ltrim(:failed, (-Sidekiq.failures_max_count), -1)
+            conn.ltrim(:failed, 0, Sidekiq.failures_max_count - 1)
           end
         end
 

data/lib/sidekiq/failures/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Failures
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

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

@@ -0,0 +1,60 @@
+<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>
+</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>
+          <time datetime="<%= "#{Time.parse(msg['failed_at']).getutc.iso8601}" %>">
+            <%= msg['failed_at'] %>
+          </time>
+        </td>
+        <td style="overflow: auto; padding: 10px;">
+          <a class="backtrace" href="#" onclick="$(this).next().toggle(); return false">
+            <%= msg['exception'] %>: <%= 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>
+<% else %>
+  <div class="alert alert-success">No failed jobs found.</div>
+<% end %>

data/lib/sidekiq/failures/web_extension.rb

@@ -10,7 +10,11 @@ module Sidekiq
           (@current_page, @total_size, @messages) = page("failed", params[:page], @count)
           @messages = @messages.map { |msg| Sidekiq.load_json(msg) }
 
-          render(:slim, File.read(File.join(view_path, "failures.slim")))
+          if Sidekiq::VERSION < "2.14.0"
+            render(:slim, File.read(File.join(view_path, "failures.slim")))
+          else
+            render(:erb, File.read(File.join(view_path, "failures.erb")))
+          end
         end
 
         app.post "/failures/remove" do

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.2.1"
+  gem.add_dependency "sidekiq", ">= 2.9.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rack-test"

data/test/middleware_test.rb

@@ -41,6 +41,11 @@ module Sidekiq
 
         assert_equal 0, failures_count
 
+        actor = MiniTest::Mock.new
+        actor.expect(:processor_done, nil, [@processor])
+        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        2.times { @boss.expect(:async, actor, []) }
+
         assert_raises TestException do
           @processor.process(msg)
         end
@@ -54,6 +59,11 @@ module Sidekiq
 
         assert_equal 0, failures_count
 
+        actor = MiniTest::Mock.new
+        actor.expect(:processor_done, nil, [@processor])
+        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        2.times { @boss.expect(:async, actor, []) }
+
         assert_raises TestException do
           @processor.process(msg)
         end
@@ -69,7 +79,9 @@ module Sidekiq
 
         actor = MiniTest::Mock.new
         actor.expect(:processor_done, nil, [@processor])
-        @boss.expect(:async, actor, [])
+        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        2.times { @boss.expect(:async, actor, []) }
+
         @processor.process(msg)
         @boss.verify
 
@@ -82,6 +94,11 @@ module Sidekiq
 
         assert_equal 0, failures_count
 
+        actor = MiniTest::Mock.new
+        actor.expect(:processor_done, nil, [@processor])
+        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        2.times { @boss.expect(:async, actor, []) }
+
         assert_raises TestException do
           @processor.process(msg)
         end
@@ -97,6 +114,11 @@ module Sidekiq
 
         assert_equal 0, failures_count
 
+        actor = MiniTest::Mock.new
+        actor.expect(:processor_done, nil, [@processor])
+        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        2.times { @boss.expect(:async, actor, []) }
+
         assert_raises TestException do
           @processor.process(msg)
         end
@@ -111,6 +133,11 @@ module Sidekiq
 
         assert_equal 0, failures_count
 
+        actor = MiniTest::Mock.new
+        actor.expect(:processor_done, nil, [@processor])
+        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        2.times { @boss.expect(:async, actor, []) }
+
         assert_raises TestException do
           @processor.process(msg)
         end
@@ -124,6 +151,11 @@ module Sidekiq
 
         assert_equal 0, failures_count
 
+        actor = MiniTest::Mock.new
+        actor.expect(:processor_done, nil, [@processor])
+        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        2.times { @boss.expect(:async, actor, []) }
+
         assert_raises TestException do
           @processor.process(msg)
         end
@@ -133,16 +165,21 @@ module Sidekiq
       end
 
       it "records failure if retry disabled and configured to track exhaustion" do
-         msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry' => false, 'failures' => 'exhausted')
- 
-         assert_equal 0, failures_count
- 
-         assert_raises TestException do
-           @processor.process(msg)
-         end
+        msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry' => false, 'failures' => 'exhausted')
+
+        assert_equal 0, failures_count
+
+        actor = MiniTest::Mock.new
+        actor.expect(:processor_done, nil, [@processor])
+        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        2.times { @boss.expect(:async, actor, []) }
+
+        assert_raises TestException do
+          @processor.process(msg)
+        end
  
-         assert_equal 1, failures_count
-         assert_equal 1, $invokes
+        assert_equal 1, failures_count
+        assert_equal 1, $invokes
        end
  
       it "records failure if retry disabled and configured to track exhaustion by default" do
@@ -152,6 +189,11 @@ module Sidekiq
 
         assert_equal 0, failures_count
 
+        actor = MiniTest::Mock.new
+        actor.expect(:processor_done, nil, [@processor])
+        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        2.times { @boss.expect(:async, actor, []) }
+
         assert_raises TestException do
           @processor.process(msg)
         end
@@ -167,6 +209,11 @@ module Sidekiq
 
         assert_equal 0, failures_count
 
+        actor = MiniTest::Mock.new
+        actor.expect(:processor_done, nil, [@processor])
+        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        2.times { @boss.expect(:async, actor, []) }
+
         assert_raises TestException do
           @processor.process(msg)
         end
@@ -184,8 +231,16 @@ module Sidekiq
         assert_equal 0, failures_count
 
         3.times do
+          boss = MiniTest::Mock.new
+          processor = ::Sidekiq::Processor.new(boss)
+          
+          actor = MiniTest::Mock.new
+          actor.expect(:processor_done, nil, [processor])
+          actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+          2.times { boss.expect(:async, actor, []) }
+
           assert_raises TestException do
-            ::Sidekiq::Processor.new(MiniTest::Mock.new).process(msg)
+            processor.process(msg)
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-failures
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +125,7 @@ files:
 - lib/sidekiq/failures.rb
 - lib/sidekiq/failures/middleware.rb
 - lib/sidekiq/failures/version.rb
+- lib/sidekiq/failures/views/failures.erb
 - lib/sidekiq/failures/views/failures.slim
 - lib/sidekiq/failures/web_extension.rb
 - sidekiq-failures.gemspec
@@ -145,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2579273263044937702
+      hash: -612683227478286431
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2579273263044937702
+      hash: -612683227478286431
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23