sidekiq 4.2.9 → 4.2.10

data/web/views/_job_info.erb

@@ -80,7 +80,7 @@
       <% if type == :dead %>
         <tr>
           <th><%= t('LastRetry') %></th>
-          <td><%= relative_time(job.at) %></td>
+          <td><%= relative_time(job.at) if job['retry_count'] %></td>
         </tr>
       <% end %>
     </tbody>

data/web/views/dashboard.erb

@@ -9,9 +9,9 @@
   </h3>
   <div class="interval-slider">
     <span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
-    <span class="current-interval">2 sec</span>
+    <span class="current-interval">5 sec</span>
     <br/>
-    <input type="range" min="2000" max="20000" step="1000" value="2000"/>
+    <input type="range" min="2000" max="20000" step="1000" value="5000"/>
   </div>
 </div>
 

data/web/views/morgue.erb

@@ -47,7 +47,9 @@
               <div class="args"><%= display_args(entry.display_args) %></div>
             </td>
             <td>
+              <% if entry.error? %>
               <div><%= h truncate("#{entry['error_class']}: #{entry['error_message']}", 200) %></div>
+              <% end %>
             </td>
           </tr>
         <% end %>

data/web/views/queue.erb

@@ -8,7 +8,7 @@
     </h3>
   </div>
   <div class="col-sm-4 pull-right">
-    <%= erb :_paging, locals: { url: "#{root_path}queues/#{@name}" } %>
+    <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
   </div>
 </header>
 <div class="table_container">
@@ -32,7 +32,7 @@
           <% end %>
         </td>
         <td>
-          <form action="<%= root_path %>queues/<%= @name %>/delete" method="post">
+          <form action="<%= root_path %>queues/<%= CGI.escape(@name) %>/delete" method="post">
             <%= csrf_tag %>
             <input name="key_val" value="<%= h Sidekiq.dump_json(msg.item) %>" type="hidden" />
             <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />

data/web/views/queues.erb

@@ -10,14 +10,14 @@
     <% @queues.each do |queue| %>
       <tr>
         <td>
-          <a href="<%= root_path %>queues/<%= queue.name %>"><%= queue.name %></a>
+          <a href="<%= root_path %>queues/<%= CGI.escape(queue.name) %>"><%= h queue.name %></a>
           <% if queue.paused? %>
             <span class="label label-danger"><%= t('Paused') %></span>
           <% end %>
         </td>
         <td><%= number_with_delimiter(queue.size) %> </td>
         <td class="delete-confirm">
-          <form action="<%=root_path %>queues/<%= queue.name %>" method="post">
+          <form action="<%=root_path %>queues/<%= CGI.escape(queue.name) %>" method="post">
             <%= csrf_tag %>
             <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
           </form>

data/web/views/retry.erb

@@ -7,7 +7,7 @@
       <tr>
         <th><%= t('ErrorClass') %></th>
         <td>
-          <code><%= h @retry.display_class %></code>
+          <code><%= h @retry['error_class'] %></code>
         </td>
       </tr>
       <tr>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.2.9
+  version: 4.2.10
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -146,6 +146,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: percy-capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: Simple, efficient background processing for Ruby.
 email:
 - mperham@gmail.com
@@ -214,36 +284,6 @@ files:
 - lib/sidekiq/web/router.rb
 - lib/sidekiq/worker.rb
 - sidekiq.gemspec
-- test/config.yml
-- test/env_based_config.yml
-- test/fake_env.rb
-- test/fixtures/en.yml
-- test/helper.rb
-- test/test_actors.rb
-- test/test_api.rb
-- test/test_cli.rb
-- test/test_client.rb
-- test/test_exception_handler.rb
-- test/test_extensions.rb
-- test/test_fetch.rb
-- test/test_launcher.rb
-- test/test_logging.rb
-- test/test_manager.rb
-- test/test_middleware.rb
-- test/test_processor.rb
-- test/test_rails.rb
-- test/test_redis_connection.rb
-- test/test_retry.rb
-- test/test_retry_exhausted.rb
-- test/test_scheduled.rb
-- test/test_scheduling.rb
-- test/test_sidekiq.rb
-- test/test_testing.rb
-- test/test_testing_fake.rb
-- test/test_testing_inline.rb
-- test/test_util.rb
-- test/test_web.rb
-- test/test_web_helpers.rb
 - web/assets/images/favicon.ico
 - web/assets/images/logo.png
 - web/assets/images/status.png
@@ -257,6 +297,7 @@ files:
 - web/locales/el.yml
 - web/locales/en.yml
 - web/locales/es.yml
+- web/locales/fa.yml
 - web/locales/fr.yml
 - web/locales/hi.yml
 - web/locales/it.yml
@@ -315,34 +356,4 @@ rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Simple, efficient background processing for Ruby
-test_files:
-- test/config.yml
-- test/env_based_config.yml
-- test/fake_env.rb
-- test/fixtures/en.yml
-- test/helper.rb
-- test/test_actors.rb
-- test/test_api.rb
-- test/test_cli.rb
-- test/test_client.rb
-- test/test_exception_handler.rb
-- test/test_extensions.rb
-- test/test_fetch.rb
-- test/test_launcher.rb
-- test/test_logging.rb
-- test/test_manager.rb
-- test/test_middleware.rb
-- test/test_processor.rb
-- test/test_rails.rb
-- test/test_redis_connection.rb
-- test/test_retry.rb
-- test/test_retry_exhausted.rb
-- test/test_scheduled.rb
-- test/test_scheduling.rb
-- test/test_sidekiq.rb
-- test/test_testing.rb
-- test/test_testing_fake.rb
-- test/test_testing_inline.rb
-- test/test_util.rb
-- test/test_web.rb
-- test/test_web_helpers.rb
+test_files: []

data/test/config.yml

@@ -1,9 +0,0 @@
----
-:verbose:      false
-:require:      ./test/fake_env.rb
-:pidfile:      /tmp/sidekiq-config-test.pid
-:logfile:      /tmp/sidekiq.log
-:concurrency:  50
-:queues:
-  - [<%="very_"%>often, 2]
-  - [seldom, 1]

data/test/env_based_config.yml

@@ -1,11 +0,0 @@
----
-:pidfile:      /tmp/sidekiq-config-test.pid
-:concurrency:  50
-staging:
-  :verbose:      false
-  :require:      ./test/fake_env.rb
-  :logfile:      /tmp/sidekiq.log
-  :concurrency:  5
-  :queues:
-    - [<%="very_"%>often, 2]
-    - [seldom, 1]

data/test/fake_env.rb

@@ -1 +0,0 @@
-# frozen_string_literal: true

data/test/fixtures/en.yml

@@ -1,2 +0,0 @@
-en:
-  translated_text: 'Changed text from add locals'

data/test/helper.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-$TESTING = true
-# disable minitest/parallel threads
-ENV["N"] = "0"
-
-if ENV["COVERAGE"]
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter "/test/"
-    add_filter "/myapp/"
-  end
-end
-ENV['RACK_ENV'] = ENV['RAILS_ENV'] = 'test'
-
-trap 'USR1' do
-  threads = Thread.list
-
-  puts
-  puts "=" * 80
-  puts "Received USR1 signal; printing all #{threads.count} thread backtraces."
-
-  threads.each do |thr|
-    description = thr == Thread.main ? "Main thread" : thr.inspect
-    puts
-    puts "#{description} backtrace: "
-    puts thr.backtrace.join("\n")
-  end
-
-  puts "=" * 80
-end
-
-begin
-  require 'pry-byebug'
-rescue LoadError
-end
-
-require 'minitest/autorun'
-
-require 'sidekiq'
-require 'sidekiq/util'
-Sidekiq.logger.level = Logger::ERROR
-
-Sidekiq::Test = Minitest::Test
-
-require 'sidekiq/redis_connection'
-REDIS_URL = ENV['REDIS_URL'] || 'redis://localhost/15'
-REDIS = Sidekiq::RedisConnection.create(:url => REDIS_URL, :namespace => 'testy')
-
-Sidekiq.configure_client do |config|
-  config.redis = { :url => REDIS_URL, :namespace => 'testy' }
-end
-
-def capture_logging(lvl=Logger::INFO)
-  old = Sidekiq.logger
-  begin
-    out = StringIO.new
-    logger = Logger.new(out)
-    logger.level = lvl
-    Sidekiq.logger = logger
-    yield
-    out.string
-  ensure
-    Sidekiq.logger = old
-  end
-end
-
-def with_logging(lvl=Logger::DEBUG)
-  old = Sidekiq.logger.level
-  begin
-    Sidekiq.logger.level = lvl
-    yield
-  ensure
-    Sidekiq.logger.level = old
-  end
-end

data/test/test_actors.rb

@@ -1,138 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-require 'sidekiq/cli'
-require 'sidekiq/fetch'
-require 'sidekiq/scheduled'
-require 'sidekiq/processor'
-
-class TestActors < Sidekiq::Test
-  class JoeWorker
-    include Sidekiq::Worker
-    def perform(slp)
-      raise "boom" if slp == "boom"
-      sleep(slp) if slp > 0
-      $count += 1
-    end
-  end
-
-  describe 'threads' do
-    before do
-      Sidekiq.redis {|c| c.flushdb}
-    end
-
-    describe 'scheduler' do
-      it 'can start and stop' do
-        f = Sidekiq::Scheduled::Poller.new
-        f.start
-        f.terminate
-      end
-
-      it 'can schedule' do
-        ss = Sidekiq::ScheduledSet.new
-        q = Sidekiq::Queue.new
-
-        JoeWorker.perform_in(0.01, 0)
-
-        assert_equal 0, q.size
-        assert_equal 1, ss.size
-
-        sleep 0.015
-        s = Sidekiq::Scheduled::Poller.new
-        s.enqueue
-        assert_equal 1, q.size
-        assert_equal 0, ss.size
-        s.terminate
-      end
-    end
-
-    describe 'processor' do
-      before do
-        $count = 0
-      end
-
-      it 'can start and stop' do
-        f = Sidekiq::Processor.new(Mgr.new)
-        f.terminate
-      end
-
-      class Mgr
-        attr_reader :latest_error
-        attr_reader :mutex
-        attr_reader :cond
-        def initialize
-          @mutex = ::Mutex.new
-          @cond = ::ConditionVariable.new
-        end
-        def processor_died(inst, err)
-          @latest_error = err
-          @mutex.synchronize do
-            @cond.signal
-          end
-        end
-        def processor_stopped(inst)
-          @mutex.synchronize do
-            @cond.signal
-          end
-        end
-        def options
-          { :concurrency => 3, :queues => ['default'] }
-        end
-      end
-
-      it 'can process' do
-        mgr = Mgr.new
-
-        p = Sidekiq::Processor.new(mgr)
-        JoeWorker.perform_async(0)
-
-        a = $count
-        p.process_one
-        b = $count
-        assert_equal a + 1, b
-      end
-
-      it 'deals with errors' do
-        mgr = Mgr.new
-
-        p = Sidekiq::Processor.new(mgr)
-        JoeWorker.perform_async("boom")
-        q = Sidekiq::Queue.new
-        assert_equal 1, q.size
-
-        a = $count
-        mgr.mutex.synchronize do
-          p.start
-          mgr.cond.wait(mgr.mutex)
-        end
-        b = $count
-        assert_equal a, b
-
-        sleep 0.001
-        assert_equal false, p.thread.status
-        p.terminate(true)
-        refute_nil mgr.latest_error
-        assert_equal RuntimeError, mgr.latest_error.class
-      end
-
-      it 'gracefully kills' do
-        mgr = Mgr.new
-
-        p = Sidekiq::Processor.new(mgr)
-        JoeWorker.perform_async(1)
-        q = Sidekiq::Queue.new
-        assert_equal 1, q.size
-
-        a = $count
-        p.start
-        sleep(0.02)
-        p.terminate
-        p.kill(true)
-
-        b = $count
-        assert_equal a, b
-        assert_equal false, p.thread.status
-        refute mgr.latest_error, mgr.latest_error.to_s
-      end
-    end
-  end
-end