sidekiq-failures 0.4.5 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3cf2e8b86ea584dc2d01d303a8b810a3527da318
-  data.tar.gz: ea8731360ed096a6f6b885cb3f078a80bb96747e
+SHA256:
+  metadata.gz: 71e370c4485d8ecc481914afd5d8a489c9f2743c1749975dceb536977607230a
+  data.tar.gz: 1a8e989912c378459e478eb9f29c0dd1d53128c126cc135c2bf597375e26ed84
 SHA512:
-  metadata.gz: dd021e8afcbd6a59c8d725d2954f7d45cbb50475b3c342b8e5d00533dd3c72594548d4fdb197e3d5a3cd51d158f000c050da57d353ef294c67bfe7880243dad8
-  data.tar.gz: 422b175ead022b822ae08838a03365f22e6e4a0a2213ff8f9c2756ed3f41b14c58e9e7f950f32adce8d8f25e440c3a5a8b78753798a4162ddf8626cd9bb2c977
+  metadata.gz: 49f99dbee68555a41e53d615e27afa48f5852d0f887fd96891864c89fd86f5d72fe552d9eefa5b22f860502d6bed321c38f5a4fd28ea5c4f1dfeea703c9d17eb
+  data.tar.gz: f59b94960937b9f7d3482c79f79b905015fac87df83bcde5db946023383658138d7226003431a4ece758780f0ad06e7a1b2785258917d19fc5a9278fe6583267

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.6, 2.7, '3.0', 3.1]
+        sidekiq: [4.2, 5.2, 6.2]
+    services:
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+    env:
+      SIDEKIQ_VERSION: ~> ${{ matrix.sidekiq }}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true # 'bundle install' and cache gems
+        ruby-version: ${{ matrix.ruby }}
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -17,4 +17,4 @@ tmp
 Gemfile.lock
 .ruby-version
 .ruby-gemset
-
+.tool-versions

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 ## Unreleased
 
+## 1.0.4
+
+  * Sanitize failure text on the failure details page (#144 @mcasper)
+
+## 1.0.3
+
+  * Expand failure descriptions with pure JS (#141 @icyleaf)
+
+## 1.0.2
+
+  * Pass now required argument to Sidekiq's JobRetry.new (#140 @mcasper)
+
+## 1.0.1
+
+  * Add license config to the gemspec (#115 @reiz)
+  * Guard against failure error_message being `nil` (#122 @mcasper)
+  * Fix filtering failures with 0 results on Sidekiq Pro (#125 @substars)
+
+## 1.0.0
+
+  * WebUI improvements (@bbtfr)
+  * Use ActiveJob to display info when available (@dreyks)
+  * New locales (@ryohashimoto @gurgelrenan)
+  * Sidekiq 4 and higher compatibility (@davekrupinski )
+  * Sidekiq 5 fixes (@fidelisrafael)
+
 ## 0.4.5
 
   * Limit error message to 500 symbols (@antonzaytsev)

data/Gemfile

@@ -4,3 +4,9 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'sidekiq', ENV['SIDEKIQ_VERSION'] if ENV['SIDEKIQ_VERSION']
+
+# to test Pro-specific functionality, set SIDEKIQ_PRO_CREDS on `bundle install`
+# and SIDEKIQ_PRO_VERSION on `bundle install` and `rake test`
+source "https://#{ENV['SIDEKIQ_PRO_CREDS']}@enterprise.contribsys.com/" do    
+    gem 'sidekiq-pro', ENV['SIDEKIQ_PRO_VERSION'] if ENV['SIDEKIQ_PRO_VERSION']
+end if ENV['SIDEKIQ_PRO_VERSION']

data/README.md

@@ -1,4 +1,4 @@
-# Sidekiq::Failures [![Build Status](https://secure.travis-ci.org/mhfs/sidekiq-failures.png)](http://travis-ci.org/mhfs/sidekiq-failures)
+# Sidekiq::Failures ![Build Status](https://github.com/mhfs/sidekiq-failures/workflows/CI/badge.svg)
 
 Keeps track of Sidekiq failed jobs and adds a tab to the Web UI to let you browse
 them. Makes use of Sidekiq's custom tabs and middleware chain.
@@ -20,6 +20,8 @@ gem 'sidekiq-failures'
 Simply having the gem in your Gemfile is enough to get you started. Your failed
 jobs will be visible via a Failures tab in the Web UI.
 
+If you have not previously used the Web UI, it is a part of the Sidekiq gem. [See Sidekiq's docs about Web UI here.](https://github.com/mperham/sidekiq/wiki/Monitoring#web-ui)
+
 ## Configuring
 
 ### Maximum Tracked Failures
@@ -136,7 +138,7 @@ Sidekiq::Failures.reset_failures
 
 ## Dependencies
 
-Depends on Sidekiq >= 2.16.0
+Depends on Sidekiq >= 4.0.0
 
 ## Contributing
 

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

@@ -0,0 +1,6 @@
+# encoding: utf-8
+ja:
+  FailedJobs: 失敗したジョブ
+  FailedAt: 失敗した日時
+  ResetCounter: カウンターをリセット
+  NoFailedJobsFound: 失敗したジョブはありません

data/lib/sidekiq/failures/locales/pt-BR.yml

@@ -0,0 +1,5 @@
+pt-BR:
+  FailedJobs: Processos Falhos
+  FailedAt: Falhou em
+  ResetCounter: Resetar contador
+  NoFailedJobsFound: Nenhum Processo falho encontrado

data/lib/sidekiq/failures/locales/zh-cn.yml

@@ -0,0 +1,5 @@
+zh-cn:
+  FailedJobs: 失败的任务
+  FailedAt: 失败时间
+  ResetCounter: 重置计数器
+  NoFailedJobsFound: 没有发现失败的任务

data/lib/sidekiq/failures/middleware.rb

@@ -80,11 +80,12 @@ module Sidekiq
       end
 
       def retry_middleware
-        @retry_middleware ||= Sidekiq::Middleware::Server::RetryJobs.new
+        @retry_middleware ||=
+          Sidekiq::Failures.retry_middleware_class.new(@config || {})
       end
 
       def default_max_retries
-        Sidekiq::Middleware::Server::RetryJobs::DEFAULT_MAX_RETRY_ATTEMPTS
+        Sidekiq::Failures.retry_middleware_class::DEFAULT_MAX_RETRY_ATTEMPTS
       end
 
       def hostname

data/lib/sidekiq/failures/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Failures
-    VERSION = "0.4.5"
+    VERSION = "1.0.4"
   end
 end

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

@@ -6,12 +6,12 @@
     <tr>
       <th><%= t('ErrorClass') %></th>
       <td>
-        <code><%= @failure['error_class'] %></code>
+        <code><%= h @failure['error_class'] %></code>
       </td>
     </tr>
     <tr>
       <th><%= t('ErrorMessage') %></th>
-      <td><%= @failure['error_message'] %></td>
+      <td><%= h @failure['error_message'] %></td>
     </tr>
     <% if !@failure['error_backtrace'].nil? %>
       <tr>

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

@@ -2,7 +2,7 @@
   <div class="col-sm-5">
     <h3><%= t('FailedJobs') %></h3>
   </div>
-  <% if @failures.size > 0 && @total_size > @count %>
+  <% if @failures.count > 0 && @total_size > @count %>
     <div class="col-sm-4">
       <%= erb :_paging, :locals => { :url => "#{root_path}failures" } %>
     </div>
@@ -10,7 +10,7 @@
   <%= filtering('failures') if respond_to?(:filtering) %>
 </header>
 
-<% if @failures.size > 0 %>
+<% if @failures.count > 0 %>
   <form action="<%= root_path %>failures" method="post">
     <%= csrf_tag if respond_to?(:csrf_tag) %>
     <table class="table table-striped table-bordered table-white">
@@ -21,11 +21,11 @@
               <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>
+          <th><%= t('FailedAt') %></th>
+          <th><%= t('Queue') %></th>
+          <th><%= t('Worker') %></th>
+          <th><%= t('Arguments') %></th>
+          <th><%= t('Error') %></th>
         </tr>
       </thead>
       <% @failures.each do |entry| %>
@@ -35,17 +35,19 @@
               <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>
+            <a href="<%= root_path %>failures/<%= job_params(entry.item, entry.score) %>"><%= safe_relative_time(entry['failed_at']) %></a>
           </td>
           <td>
             <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
           </td>
-          <td><%= safe_relative_time(entry['failed_at']) %></td>
+          <td><%= entry.respond_to?(:display_class) ? entry.display_class : entry.klass %></td>
+          <td>
+            <div class="args"><%= display_args(entry.respond_to?(:display_args) ? entry.display_args : entry.args) %></div>
+          </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'].size > 500 ? entry['error_message'][0..500] + '...' : entry['error_message'] %>
+            <a class="backtrace" href="javascript:void(0)", onclick="toggle_error_backtrace(this)">
+              <%= h entry['error_class'] %>: <%= h entry['error_message'].to_s.size > 500 ? entry['error_message'][0..500] + '...' : entry['error_message'] %>
             </a>
             <pre style="display: none; background: none; border: 0; width: 100%; max-height: 30em; font-size: 0.8em; white-space: nowrap; overflow: auto;">
               <%= entry['error_backtrace'].join("<br />") if entry['error_backtrace'] %>
@@ -70,16 +72,34 @@
     <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
   </form>
 
-  <% if @failures.size > 0 && @total_size > @count %>
+  <% if @failures.count > 0 && @total_size > @count %>
     <div class="col-sm-4">
       <%= erb :_paging, :locals => { :url => "#{root_path}failures" } %>
     </div>
   <% end %>
 
+  <script>
+  function toggle_error_backtrace(e) {
+    let x = e.nextElementSibling;
+    if (x.style.display === "none") {
+      x.style.display = "block";
+    } else {
+      x.style.display = "none";
+    }
+  }
+  </script>
+
+  <style type="text/css">
+  @media only screen and (prefers-color-scheme: dark) {
+    pre {
+      color: white
+    }
+  }
+  </style>
 <% else %>
   <div class="alert alert-success"><%= t('NoFailedJobsFound') %></div>
 <% end %>
 <form action="<%= root_path %>failures/all/reset" method="post">
   <%= csrf_tag if respond_to?(:csrf_tag) %>
-  <input class="btn btn-danger btn-xs pull-right" type="submit" name="reset" value="<%= t('Reset Counter') %>" data-confirm="<%= t('AreYouSure') %>" />
+  <input class="btn btn-danger btn-xs pull-right" type="submit" name="reset" value="<%= t('ResetCounter') %>" data-confirm="<%= t('AreYouSure') %>" />
 </form>

data/lib/sidekiq/failures/web_extension.rb

@@ -19,7 +19,7 @@ module Sidekiq
 
         app.get "/failures" do
           @count = (params[:count] || 25).to_i
-          (@current_page, @total_size, @failures) = page(LIST_KEY, params[:page], @count)
+          (@current_page, @total_size, @failures) = page(LIST_KEY, params[:page], @count, :reverse => true)
           @failures = @failures.map {|msg, score| Sidekiq::SortedEntry.new(nil, score, msg) }
 
           render(:erb, File.read(File.join(view_path, "failures.erb")))
@@ -78,6 +78,17 @@ module Sidekiq
           FailureSet.new.retry_all_failures
           redirect "#{root_path}failures"
         end
+
+        app.get '/filter/failures' do
+          redirect "#{root_path}failures"
+        end
+
+        app.post '/filter/failures' do
+          @failures = Sidekiq::Failures::FailureSet.new.scan("*#{params[:substr]}*")
+          @current_page = 1
+          @count = @total_size = @failures.count          
+          render(:erb, File.read(File.join(view_path, "failures.erb")))
+        end
       end
     end
   end

data/lib/sidekiq/failures.rb

@@ -5,6 +5,7 @@ rescue LoadError
 end
 
 require "sidekiq/api"
+require "sidekiq/version"
 require "sidekiq/failures/version"
 require "sidekiq/failures/sorted_entry"
 require "sidekiq/failures/failure_set"
@@ -47,9 +48,11 @@ module Sidekiq
 
   # Fetches the failures max count value
   def self.failures_max_count
-    return 1000 if @failures_max_count.nil?
-
-    @failures_max_count
+    if !instance_variable_defined?(:@failures_max_count) || @failures_max_count.nil?
+      1000
+    else
+      @failures_max_count
+    end
   end
 
   module Failures
@@ -62,12 +65,23 @@ module Sidekiq
     def self.count
       Sidekiq.redis {|r| r.zcard(LIST_KEY) }
     end
+
+    def self.retry_middleware_class
+      if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('5.0.0')
+        require 'sidekiq/job_retry'
+        Sidekiq::JobRetry
+      else
+        require 'sidekiq/middleware/server/retry_jobs'
+        Sidekiq::Middleware::Server::RetryJobs
+      end
+    end
+
   end
 end
 
 Sidekiq.configure_server do |config|
   config.server_middleware do |chain|
-    chain.insert_before Sidekiq::Middleware::Server::RetryJobs,
+    chain.insert_before Sidekiq::Failures.retry_middleware_class,
                         Sidekiq::Failures::Middleware
   end
 end

data/sidekiq-failures.gemspec

@@ -7,18 +7,26 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Keep track of Sidekiq failed jobs}
   gem.summary       = %q{Keeps track of Sidekiq failed jobs and adds a tab to the Web UI to let you browse them. Makes use of Sidekiq's custom tabs and middleware chain.}
   gem.homepage      = "https://github.com/mhfs/sidekiq-failures/"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "sidekiq-failures"
   gem.require_paths = ["lib"]
   gem.version       = Sidekiq::Failures::VERSION
 
-  gem.add_dependency "sidekiq", ">= 2.16.0"
+  gem.add_dependency "sidekiq", ">= 4.0.0"
 
+  # Redis 4.X is incompatible with Ruby < 2.3, but the Ruby version constraint
+  # wasn't added until 4.1.2, meaning you can get an incompatible version of the
+  # redis gem when running Ruby 2.2 without this constraint.
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.3.0")
+    gem.add_dependency "redis", "< 4.0"
+  end
+
+  gem.add_development_dependency "minitest"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rack-test"
   gem.add_development_dependency "sprockets"
   gem.add_development_dependency "sinatra"
+  gem.add_development_dependency "pry"
 end

data/test/failures_test.rb

@@ -0,0 +1,16 @@
+require "test_helper"
+
+module Sidekiq
+  describe Failures do
+    describe '.retry_middleware_class' do
+      it 'returns based on Sidekiq::VERISON' do
+        case Sidekiq::VERSION[0]
+        when '5'
+          assert_equal Failures.retry_middleware_class, Sidekiq::JobRetry
+        when '4'
+          assert_equal Failures.retry_middleware_class, Sidekiq::Middleware::Server::RetryJobs
+        end
+      end
+    end
+  end
+end

data/test/middleware_test.rb

@@ -1,19 +1,72 @@
 require "test_helper"
 
+class SidekiqPre6
+  def new_processor(boss)
+    num_options_calls.times { boss.expect(:options, {:queues => ['default'] }, []) }
+    ::Sidekiq::Processor.new(boss)
+  end
+
+  private
+
+  def num_options_calls
+    if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('5.0.3')
+      3
+    else
+      2
+    end
+  end
+end
+
+class SidekiqPre63
+  def new_processor(boss)
+    opts = {
+      queues: ['default'],
+    }
+    opts[:fetch] = Sidekiq::BasicFetch.new(opts)
+    ::Sidekiq::Processor.new(boss, opts)
+  end
+end
+
+class SidekiqPost63
+  def new_processor(boss)
+    config = Sidekiq
+    config[:queues] = ['default']
+    config[:fetch] = Sidekiq::BasicFetch.new(config)
+    config[:error_handlers] << Sidekiq.method(:default_error_handler)
+    ::Sidekiq::Processor.new(config) { |processor, reason = nil| }
+  end
+end
+
 module Sidekiq
   module Failures
     describe "Middleware" do
+      def new_provider
+        version = Gem::Version.new(Sidekiq::VERSION)
+        if version >= Gem::Version.new('6.4.0')
+          SidekiqPost63
+        elsif version >= Gem::Version.new('6.0')
+          SidekiqPre63
+        else
+          SidekiqPre6
+        end.new
+      end
+
       before do
-        Celluloid.boot
         $invokes = 0
         @boss = MiniTest::Mock.new
-        @processor = ::Sidekiq::Processor.new(@boss)
+        @provider = new_provider
+        @processor = @provider.new_processor(@boss)
+
         Sidekiq.server_middleware {|chain| chain.add Sidekiq::Failures::Middleware }
         Sidekiq.redis = REDIS
         Sidekiq.redis { |c| c.flushdb }
         Sidekiq.instance_eval { @failures_default_mode = nil }
       end
 
+      after do
+        @boss.verify
+      end
+
       TestException = Class.new(Exception)
       ShutdownException = Class.new(Sidekiq::Shutdown)
 
@@ -42,11 +95,6 @@ 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
@@ -60,11 +108,6 @@ 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
@@ -78,13 +121,7 @@ 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, []) }
-
         @processor.process(msg)
-        @boss.verify
 
         assert_equal 0, failures_count
         assert_equal 1, $invokes
@@ -95,11 +132,6 @@ 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
@@ -115,11 +147,6 @@ 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
@@ -134,11 +161,6 @@ 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
@@ -152,11 +174,6 @@ 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
@@ -170,11 +187,6 @@ 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
@@ -190,11 +202,6 @@ 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
@@ -210,11 +217,6 @@ 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
@@ -233,16 +235,13 @@ module Sidekiq
 
         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, []) }
+          processor = @provider.new_processor(boss)
 
           assert_raises TestException do
             processor.process(msg)
           end
+
+          boss.verify
         end
 
         assert_equal 2, failures_count
@@ -259,11 +258,6 @@ module Sidekiq
 
         assert_equal 0, Sidekiq::Failures.count
 
-        actor = MiniTest::Mock.new
-        actor.expect(:processor_done, nil, [@processor])
-        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
-        @boss.expect(:async, actor, [])
-
         assert_raises TestException do
           @processor.process(msg)
         end

data/test/test_helper.rb

@@ -1,5 +1,4 @@
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
+$TESTING = true
 
 require "minitest/autorun"
 require "minitest/spec"
@@ -7,14 +6,13 @@ require "minitest/mock"
 
 require "rack/test"
 
-require "celluloid"
 require "sidekiq"
+require "sidekiq-pro" if ENV['SIDEKIQ_PRO_VERSION']
 require "sidekiq-failures"
 require "sidekiq/processor"
 require "sidekiq/fetch"
 require "sidekiq/cli"
 
-Celluloid.logger = nil
 Sidekiq.logger.level = Logger::ERROR
 
-REDIS = Sidekiq::RedisConnection.create(:url => "redis://localhost/15", :namespace => 'sidekiq_failures_test')
+REDIS = Sidekiq::RedisConnection.create(url: "redis://localhost/15")

data/test/web_extension_test.rb

@@ -5,11 +5,15 @@ module Sidekiq
   describe "WebExtension" do
     include Rack::Test::Methods
 
+    TOKEN = SecureRandom.base64(32).freeze
+
     def app
       Sidekiq::Web
     end
 
     before do
+      env 'rack.session', { csrf: TOKEN }
+      env 'HTTP_X_CSRF_TOKEN', TOKEN
       Sidekiq.redis = REDIS
       Sidekiq.redis {|c| c.flushdb }
     end
@@ -17,22 +21,22 @@ module Sidekiq
     it 'can display home with failures tab' do
       get '/'
 
-      last_response.status.must_equal 200
-      last_response.body.must_match /Sidekiq/
-      last_response.body.must_match /Failures/
+      _(last_response.status).must_equal 200
+      _(last_response.body).must_match(/Sidekiq/)
+      _(last_response.body).must_match(/Failures/)
     end
 
     it 'can display failures page without any failures' do
       get '/failures'
-      last_response.status.must_equal 200
-      last_response.body.must_match /Failed Jobs/
-      last_response.body.must_match /No failed jobs found/
+      _(last_response.status).must_equal 200
+      _(last_response.body).must_match(/Failed Jobs/)
+      _(last_response.body).must_match(/No failed jobs found/)
     end
 
     it 'has the reset counter form and action' do
       get '/failures'
-      last_response.body.must_match /failures\/all\/reset/
-      last_response.body.must_match /Reset Counter/
+      _(last_response.body).must_match(/failures\/all\/reset/)
+      _(last_response.body).must_match(/Reset Counter/)
     end
 
     describe 'when there are failures' do
@@ -42,97 +46,105 @@ module Sidekiq
       end
 
       it 'should be successful' do
-        last_response.status.must_equal 200
+        _(last_response.status).must_equal 200
       end
 
       it 'can display failures page with failures listed' do
-        last_response.body.must_match /Failed Jobs/
-        last_response.body.must_match /HardWorker/
-        last_response.body.must_match /ArgumentError/
-        last_response.body.wont_match /No failed jobs found/
+        _(last_response.body).must_match(/Failed Jobs/)
+        _(last_response.body).must_match(/HardWorker/)
+        _(last_response.body).must_match(/ArgumentError/)
+        _(last_response.body).wont_match(/No failed jobs found/)
       end
 
       it 'can reset counter' do
         assert_equal failed_count, "1"
 
-        last_response.body.must_match /HardWorker/
+        _(last_response.body).must_match(/HardWorker/)
 
         post '/failures/all/reset'
-        last_response.status.must_equal 302
-        last_response.location.must_match /failures$/
+        _(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/
+        _(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/
+        _(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/
+        _(last_response.body).must_match(/HardWorker/)
 
         post '/failures/all/delete'
-        last_response.status.must_equal 302
-        last_response.location.must_match /failures$/
+        _(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/
+        _(last_response.status).must_equal 200
+        _(last_response.body).must_match(/No failed jobs found/)
 
         assert_equal failed_count, "1"
       end
 
       it 'has the retry all form and action' do
-        last_response.body.must_match /failures\/all\/retry/
-        last_response.body.must_match /Retry All/
+        _(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/
+        _(last_response.body).must_match(/HardWorker/)
         post '/failures/all/retry'
-        last_response.status.must_equal 302
-        last_response.location.must_match /failures/
+        _(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/)
+        _(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/
+        _(last_response.body).must_match(/HardWorker/)
 
         post '/failures', { :key => [failure_score], :delete => 'Delete' }
-        last_response.status.must_equal 302
-        last_response.location.must_match /failures/
+        _(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/
+        _(last_response.status).must_equal 200
+        _(last_response.body).must_match(/No failed jobs found/)
       end
 
       it 'can retry failure from the list' do
         assert_equal failed_count, "1"
 
-        last_response.body.must_match /HardWorker/
+        _(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/
+        _(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 handle failures with nil error_message' do
+        create_sample_failure(error_message: nil)
 
         get '/failures'
-        last_response.status.must_equal 200
-        last_response.body.must_match /No failed jobs found/
+
+        _(last_response.status).must_equal 200
       end
     end
 
@@ -143,54 +155,82 @@ module Sidekiq
       end
 
       it 'should be successful' do
-        last_response.status.must_equal 200
+        _(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/
+        _(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/
+        _(last_response.body).must_match(/HardWorker/)
 
         post "/failures/#{failure_score}", :delete => 'Delete'
-        last_response.status.must_equal 302
-        last_response.location.must_match /failures/
+        _(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/
+        _(last_response.status).must_equal 302
+        _(last_response.location).must_match(/failures/)
       end
 
       it 'can retry failure' do
-        last_response.body.must_match /HardWorker/
+        _(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/
+        _(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/
+        _(last_response.status).must_equal 302
+        _(last_response.location).must_match(/failures/)
+      end
+
+      if defined? Sidekiq::Pro
+        it 'can filter failure' do
+          create_sample_failure
+          post '/filter/failures', substr: 'new'
+
+          _(last_response.status).must_equal 200
+        end
       end
     end
 
     describe 'when there is specific failure' do
       describe 'with unescaped data' do
-        before do
-          create_sample_failure(args: ['<h1>omg</h1>'], error_message: '<p>wow</p>')
-          get '/failures'
+        describe 'the index page' do
+          before do
+            create_sample_failure(args: ['<h1>omg</h1>'], error_message: '<p>wow</p>')
+            get '/failures'
+          end
+
+          it 'can escape arguments' do
+            _(last_response.body).must_match(/&quot;&lt;h1&gt;omg&lt;&#x2F;h1&gt;&quot;/)
+          end
+
+          it 'can escape error message' do
+            _(last_response.body).must_match(/ArgumentError: &lt;p&gt;wow&lt;&#x2F;p&gt;/)
+          end
         end
 
-        it 'can escape arguments' do
-          last_response.body.must_match /&quot;&lt;h1&gt;omg&lt;&#x2F;h1&gt;&quot;/
-        end
-
-        it 'can escape error message' do
-          last_response.body.must_match /ArgumentError: &lt;p&gt;wow&lt;&#x2F;p&gt;/
+        describe 'the details page' do
+          before do
+            failure = create_sample_failure(args: ['<h1>omg</h1>'], error_message: '<p>wow</p>')
+            get "/failures/#{failure[:jid]}"
+          end
+
+          it 'can escape arguments' do
+            _(last_response.status).must_equal 200
+            _(last_response.body).must_match(/<th>Error Message<\/th>\n      <td>&lt;p&gt;wow&lt;&#x2F;p&gt;<\/td>/)
+          end
+
+          it 'can escape error message' do
+            _(last_response.status).must_equal 200
+            _(last_response.body).must_match(/<th>Error Message<\/th>\n      <td>&lt;p&gt;wow&lt;&#x2F;p&gt;<\/td>/)
+          end
         end
       end
 
@@ -201,8 +241,8 @@ module Sidekiq
         end
 
         it 'should be successful' do
-          last_response.status.must_equal 200
-          last_response.body.wont_match /No failed jobs found/
+          _(last_response.status).must_equal 200
+          _(last_response.body).wont_match(/No failed jobs found/)
         end
       end
 
@@ -213,8 +253,8 @@ module Sidekiq
         end
 
         it 'should be successful' do
-          last_response.status.must_equal 200
-          last_response.body.wont_match /No failed jobs found/
+          _(last_response.status).must_equal 200
+          _(last_response.body).wont_match(/No failed jobs found/)
         end
       end
     end
@@ -238,6 +278,8 @@ module Sidekiq
           c.set("stat:failed", 1)
         end
       end
+
+      data
     end
 
     def failed_count

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-failures
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 1.0.4
 platform: ruby
 authors:
 - Marcelo Silveira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2022-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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
 email:
 - marcelo@mhfs.com.br
@@ -87,8 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -98,6 +127,9 @@ files:
 - lib/sidekiq/failures.rb
 - lib/sidekiq/failures/failure_set.rb
 - lib/sidekiq/failures/locales/en.yml
+- lib/sidekiq/failures/locales/ja.yml
+- lib/sidekiq/failures/locales/pt-BR.yml
+- lib/sidekiq/failures/locales/zh-cn.yml
 - lib/sidekiq/failures/middleware.rb
 - lib/sidekiq/failures/sorted_entry.rb
 - lib/sidekiq/failures/version.rb
@@ -105,13 +137,15 @@ files:
 - lib/sidekiq/failures/views/failures.erb
 - lib/sidekiq/failures/web_extension.rb
 - sidekiq-failures.gemspec
+- test/failures_test.rb
 - test/middleware_test.rb
 - test/test_helper.rb
 - test/web_extension_test.rb
 homepage: https://github.com/mhfs/sidekiq-failures/
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,13 +160,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: Keeps track of Sidekiq failed jobs and adds a tab to the Web UI to let you
   browse them. Makes use of Sidekiq's custom tabs and middleware chain.
-test_files:
-- test/middleware_test.rb
-- test/test_helper.rb
-- test/web_extension_test.rb
+test_files: []

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-services:
-  - redis-server
-rvm:
-  - 1.9.3
-  - jruby-19mode
-  - 2.0.0
-  - 2.1
-env:
-  matrix:
-    - SIDEKIQ_VERSION="~> 2.16"
-    - SIDEKIQ_VERSION="~> 2.17"
-    - SIDEKIQ_VERSION="~> 3.0"
-    - SIDEKIQ_VERSION="~> 3.1"
-matrix:
-  allow_failures:
-    - rvm: 1.9.3
-    - rvm: jruby-19mode