sidekiq 2.5.1 → 2.5.2

data/.rvmrc

@@ -1,4 +1,3 @@
 export RUBYOPT="-Ilib:test"
-export JRUBY_OPTS="--1.9"
 rvm use 1.9.3@sidekiq --create
 #rvm use jruby@sidekiq --create

data/Changes.md

@@ -1,3 +1,13 @@
+2.5.2
+-----------
+
+- Remove asset pipeline from Web UI for much faster, simpler runtime.  [#499, #490, #481]
+- Add -g option so the procline better identifies a Sidekiq process, defaults to File.basename(Rails.root). [#486]
+
+    sidekiq 2.5.1 myapp [0 of 25 busy]
+
+- Add splay to retry time so groups of failed jobs don't fire all at once. [#483]
+
 2.5.1
 -----------
 

data/Gemfile

@@ -3,16 +3,13 @@ gemspec
 
 gem 'celluloid', "~> 0.12.0"
 gem 'slim'
-gem 'sass'
-gem 'rails', '3.2.8'
-gem 'sqlite3'
+gem 'sqlite3', :platform => :mri
 
 group :test do
   gem 'simplecov', :require => false
 end
 
 group :development do
-  gem 'sprockets-sass'
-  gem 'compass'
+  gem 'pry', :platform => :mri
   gem 'shotgun'
 end

data/examples/sinkiq.rb

@@ -19,8 +19,8 @@ class SinatraWorker
 end
 
 get '/' do
-  @failed = Sidekiq::Stats.failed
-  @processed = Sidekiq::Stats.processed
+  @failed = Sidekiq.info[:failed]
+  @processed = Sidekiq.info[:processed]
   @messages = $redis.lrange('sinkiq-example-messages', 0, -1)
   erb :index
 end

data/lib/sidekiq/cli.rb

@@ -126,6 +126,7 @@ module Sidekiq
         require 'sidekiq/rails'
         require File.expand_path("#{options[:require]}/config/environment.rb")
         ::Rails.application.eager_load!
+        options[:tag] ||= File.basename(::Rails.root)
       else
         require options[:require]
       end
@@ -164,7 +165,11 @@ module Sidekiq
         end
 
         o.on '-t', '--timeout NUM', "Shutdown timeout" do |arg|
-          opts[:timeout] = arg.to_i
+          opts[:timeout] = Integer(arg)
+        end
+
+        o.on '-g', '--tag TAG', "Process tag for procline" do |arg|
+          opts[:tag] = arg
         end
 
         o.on '-r', '--require [PATH|DIR]', "Location of Rails application with workers or file to require" do |arg|
@@ -172,7 +177,7 @@ module Sidekiq
         end
 
         o.on '-c', '--concurrency INT', "processor threads to use" do |arg|
-          opts[:concurrency] = arg.to_i
+          opts[:concurrency] = Integer(arg)
         end
 
         o.on '-P', '--pidfile PATH', "path to pidfile" do |arg|

data/lib/sidekiq/manager.rb

@@ -27,7 +27,7 @@ module Sidekiq
       @busy = []
       @fetcher = Fetcher.new(current_actor, options[:queues], !!options[:strict])
       @ready = @count.times.map { Processor.new_link(current_actor) }
-      procline
+      procline(options[:tag] ? "#{options[:tag]} " : '')
     end
 
     def stop(options={})
@@ -153,9 +153,9 @@ module Sidekiq
       @done
     end
 
-    def procline
-      $0 = "sidekiq #{Sidekiq::VERSION} [#{@busy.size} of #{@count} busy]#{stopped? ? ' stopping' : ''}"
-      after(5) { procline }
+    def procline(tag)
+      $0 = "sidekiq #{Sidekiq::VERSION} #{tag}[#{@busy.size} of #{@count} busy]#{stopped? ? ' stopping' : ''}"
+      after(5) { procline(tag) }
     end
   end
 end

data/lib/sidekiq/middleware/server/retry_jobs.rb

@@ -43,7 +43,7 @@ module Sidekiq
 
         # delayed_job uses the same basic formula
         DEFAULT_MAX_RETRY_ATTEMPTS = 25
-        DELAY = proc { |count| (count ** 4) + 15 }
+        DELAY = proc { |count| (count ** 4) + 15 + (rand(30)*(count+1)) }
 
         def call(worker, msg, queue)
           yield

data/lib/sidekiq/testing.rb

@@ -93,8 +93,9 @@ module Sidekiq
 
       # Drain all queued jobs across all workers
       def drain_all
-        jobs.keys.each(&:drain)
-        clear_all
+        until jobs.values.all?(&:empty?) do
+          jobs.keys.each(&:drain)
+        end
       end
     end
   end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.5.1"
+  VERSION = "2.5.2"
 end

data/lib/sidekiq/web.rb

@@ -1,75 +1,17 @@
 require 'sinatra/base'
 require 'slim'
-require 'sprockets'
-require 'sprockets-sass'
-require 'sass'
-require 'compass'
 require 'sidekiq/paginator'
 
 module Sidekiq
-  class SprocketsMiddleware
-    def initialize(app, options={})
-      @app = app
-      @root = options[:root]
-      path   =  options[:path] || 'assets'
-      @matcher = /^\/#{path}\/*/
-      @environment = ::Sprockets::Environment.new(@root)
-      @environment.append_path 'assets/javascripts'
-      @environment.append_path 'assets/javascripts/vendor'
-      @environment.append_path 'assets/stylesheets'
-      @environment.append_path 'assets/stylesheets/vendor'
-      @environment.append_path 'assets/images'
-
-      Compass.configuration do |config|
-
-        config.project_path = "#{@root}/assets"
-
-        config.images_dir           = 'images'
-        config.sass_dir             = 'stylesheets'
-        config.css_dir              = 'stylesheets'
-        config.javascripts_dir      = 'javascripts'
-        config.fonts_dir            = 'stylesheets/fonts'
-
-        config.http_images_path     = '/assets'
-        config.http_generated_images_path     = '/assets'
-        config.http_javascripts_path     = '/assets'
-        config.http_stylesheets_path     = '/assets'
-
-        # You can select your preferred output style here (can be overridden via the command line):
-        output_style = :compressed
-
-        # To enable relative paths to assets via compass helper functions. Uncomment:
-        relative_assets = true
-
-        # To disable debugging comments that display the original location of your selectors. Uncomment:
-        line_comments = false
-      end
-
-
-    end
-
-    def call(env)
-      # Solve the problem of people requesting /sidekiq when they need to request /sidekiq/ so
-      # that relative links in templates resolve correctly.
-      return [301, { 'Location' => "#{env['SCRIPT_NAME']}/", 'Content-Type' => 'text/html' }, ['redirecting']] if env['SCRIPT_NAME'] == env['REQUEST_PATH']
-
-      return @app.call(env) unless @matcher =~ env["PATH_INFO"]
-      env['PATH_INFO'].sub!(@matcher,'')
-      @environment.call(env)
-    end
-  end
-
   class Web < Sinatra::Base
     include Sidekiq::Paginator
 
     dir = File.expand_path(File.dirname(__FILE__) + "/../../web")
+    set :public_folder, "#{dir}/assets"
     set :views,  "#{dir}/views"
     set :root, "#{dir}/public"
     set :slim, :pretty => true
 
-    use SprocketsMiddleware, :root => dir
-
-
     helpers do
 
       def reset_worker_list
@@ -295,3 +237,4 @@ module Sidekiq
   end
 
 end
+

data/sidekiq.gemspec

@@ -19,14 +19,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency                  'connection_pool', '~> 0.9.2'
   gem.add_dependency                  'celluloid', '~> 0.12.0'
   gem.add_dependency                  'multi_json', '~> 1'
-  gem.add_dependency                  'sprockets-sass'
-  gem.add_dependency                  'sass'
-  gem.add_dependency                  'compass'
   gem.add_development_dependency      'minitest', '~> 3'
   gem.add_development_dependency      'sinatra'
   gem.add_development_dependency      'slim'
   gem.add_development_dependency      'rake'
   gem.add_development_dependency      'actionmailer', '~> 3'
   gem.add_development_dependency      'activerecord', '~> 3'
-  gem.add_development_dependency      'pry'
 end

data/test/helper.rb

@@ -4,7 +4,10 @@ if ENV.has_key?("SIMPLECOV")
   SimpleCov.start
 end
 
-require 'pry'
+begin
+  require 'pry'
+rescue LoadError
+end
 
 require 'minitest/unit'
 require 'minitest/pride'

data/test/test_middleware.rb

@@ -43,7 +43,6 @@ class TestMiddleware < MiniTest::Unit::TestCase
     end
 
     it 'executes middleware in the proper order' do
-      recorder = []
       msg = Sidekiq.dump_json({ 'class' => CustomWorker.to_s, 'args' => [$recorder] })
 
       Sidekiq.server_middleware do |chain|

data/test/test_retry.rb

@@ -35,7 +35,7 @@ class TestRetry < MiniTest::Unit::TestCase
         end
       end
       assert msg["error_backtrace"]
-      assert_equal c, msg["error_backtrace"]
+      assert_equal c[0], msg["error_backtrace"][0]
     end
 
     it 'saves partial backtraces' do

data/test/test_stats.rb

@@ -55,7 +55,6 @@ class TestStats < MiniTest::Unit::TestCase
 
         processor = Sidekiq::Processor.new(boss)
 
-        pstr = processor.to_s
         assert_raises RuntimeError do
           processor.process(msg, 'xyzzy')
         end
@@ -71,24 +70,23 @@ class TestStats < MiniTest::Unit::TestCase
           conn.rpush 'queue:foo', '{}'
           conn.sadd 'queues', 'foo'
 
-          conn.rpush 'queue:bar', '{}'
-          conn.rpush 'queue:bar', '{}'
+          3.times { conn.rpush 'queue:bar', '{}' }
           conn.sadd 'queues', 'bar'
 
-          conn.rpush 'queue:baz', '{}'
+          2.times { conn.rpush 'queue:baz', '{}' }
           conn.sadd 'queues', 'baz'
         end
       end
 
       describe "queues_with_sizes" do
         it "returns queue names and corresponding job counts" do
-          assert_equal [["foo", 1], ["baz", 1], ["bar", 2]], Sidekiq.info[:queues_with_sizes]
+          assert_equal [["foo", 1], ["baz", 2], ["bar", 3]], Sidekiq.info[:queues_with_sizes]
         end
       end
 
       describe "backlog" do
         it "returns count of all jobs yet to be processed" do
-          assert_equal 4, Sidekiq.info[:backlog]
+          assert_equal 6, Sidekiq.info[:backlog]
         end
       end
 
@@ -97,8 +95,8 @@ class TestStats < MiniTest::Unit::TestCase
           assert_equal 0, Sidekiq.size("foox")
           assert_equal 1, Sidekiq.size(:foo)
           assert_equal 1, Sidekiq.size("foo")
-          assert_equal 3, Sidekiq.size("foo", "bar")
-          assert_equal 4, Sidekiq.size
+          assert_equal 4, Sidekiq.size("foo", "bar")
+          assert_equal 6, Sidekiq.size
         end
       end
     end

data/test/test_testing.rb

@@ -129,6 +129,15 @@ class TestTesting < MiniTest::Unit::TestCase
       end
     end
 
+    class ThirdWorker
+      include Sidekiq::Worker
+      class_attribute :count
+      def perform
+        FirstWorker.perform_async
+        SecondWorker.perform_async
+      end
+    end
+
     it 'clears jobs across all workers' do
       Sidekiq::Worker.jobs.clear
       FirstWorker.count = 0
@@ -177,5 +186,27 @@ class TestTesting < MiniTest::Unit::TestCase
       assert_equal 1, FirstWorker.count
       assert_equal 1, SecondWorker.count
     end
+
+    it 'drains jobs across all workers even when workers create new jobs' do
+      Sidekiq::Worker.jobs.clear
+      FirstWorker.count = 0
+      SecondWorker.count = 0
+
+      assert_equal 0, ThirdWorker.jobs.size
+
+      assert_equal 0, FirstWorker.count
+      assert_equal 0, SecondWorker.count
+
+      ThirdWorker.perform_async
+
+      assert_equal 1, ThirdWorker.jobs.size
+
+      Sidekiq::Worker.drain_all
+
+      assert_equal 0, ThirdWorker.jobs.size
+
+      assert_equal 1, FirstWorker.count
+      assert_equal 1, SecondWorker.count
+    end
   end
 end

data/web/assets/javascripts/application.js

@@ -1,8 +1,3 @@
-//= require vendor/jquery
-//= require vendor/jquery.timeago
-//= require bootstrap
-//= require_tree .
-
 $(function() {
   $.timeago.settings.allowFuture = true;
   $.timeago.settings.refreshMillis = 0;
@@ -25,12 +20,12 @@ $(function() {
 
   $('a[name=poll]').data('polling', false);
 
-  pollStatus = $('.poll-status')
+  var pollStatus = $('.poll-status');
 
-  pollStatusText = pollStatus.find('.text')
-  pollStatusBadge = pollStatus.find('.badge')
+  var pollStatusText = pollStatus.find('.text');
+  var pollStatusBadge = pollStatus.find('.badge');
   pollStatusBadge.hide();
-  pollStatusMarkup = pollStatus.html();
+  var pollStatusMarkup = pollStatus.html();
 
   $('a[name=poll]').on('click', function(e) {
     e.preventDefault();
@@ -75,9 +70,9 @@ $(function() {
       $('time').timeago();
     });
     var currentTime = new Date();
-    $('.poll-status .text').text('Last polled: ')
+    $('.poll-status .text').text('Last polled: ');
     $('.poll-status .time').show().text(currentTime.getHours() + ':' + pad(currentTime.getMinutes()) + ':' + pad(currentTime.getSeconds()));
-  }
+  };
 });
 
 $(function() {