sidekiq 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a763f8ad28c68c25f87a3cd858b5aa7aafc692e7
-  data.tar.gz: ac87d118a8035ddce4515af0a73a67bb84ea684b
+  metadata.gz: 77c9c265afa18620c059fe584f8925ffaa094684
+  data.tar.gz: 4bce31343a0b697595307f281c959845e5bf810c
 SHA512:
-  metadata.gz: bd5f4c504c85438366e296c17bb33faaa2b3e78dc484989fdb3b503f25de07e97fee9566154dbd8a6fa33373ce2d3536dc027f33e77527c42c39768dc3befebe
-  data.tar.gz: 47875b3a13a707f9fd7267ae8030353c425d46f2b4da82ec954cdc54020c2b3bd8e774bc463b63b8022149bd6249b17fe3dd217d85f3f51416ff71757fe9a3df
+  metadata.gz: 5c8cca245d7123e6664c6d182c9e452c31895e3691f370c50661a180d0e3aa6b154ca66cde78b95ffaedf031b04a2d0dbc0ce99e82ffc66e82c3ea1e02b2ecc1
+  data.tar.gz: df0969715c7789e9793288c57fbeae8d74bf4fb192d0dee73bb106fae627fbc5e6b9bc07ce0d718e4ec30d3bed6f9d84aa511e8f7e795087b5f664ba2116f46b

data/.github/issue_template.md

@@ -0,0 +1,4 @@
+Ruby version:
+Sidekiq / Pro / Enterprise version(s):
+
+If relevant, please include your initializer and any error message with the full backtrace.

data/4.0-Upgrade.md

@@ -25,6 +25,9 @@ gem 'redis-namespace'
   `concurrency + 2` connections in your pool or Sidekiq will exit.
   When in doubt, let Sidekiq size the connection pool for you.
 
+* Worker data is no longer updated in real-time but rather upon every
+  heartbeat.  Don't expect the `Sidekiq::Workers` API to be millisecond-precise.
+
 * There's a new testing API based off the `Sidekiq::Queues` namespace. All
   assertions made against the Worker class still work as expected.
 ```ruby

data/Changes.md

@@ -1,9 +1,38 @@
 # Sidekiq Changes
 
+4.1.3
+-----------
+
+- Sinatra 1.4.x is now a required dependency, avoiding cryptic errors
+  and old bugs due to people not upgrading Sinatra for years. [#3042]
+- Fixed race condition in heartbeat which could rarely lead to lingering
+  processes on the Busy tab. [#2982]
+```ruby
+# To clean up lingering processes, modify this as necessary to connect to your Redis.
+# After 60 seconds, lingering processes should disappear from the Busy page.
+
+require 'redis'
+r = Redis.new(url: "redis://localhost:6379/0")
+# uncomment if you need a namespace
+#require 'redis-namespace'
+#r = Redis::Namespace.new("foo", r)
+r.smembers("processes").each do |pro|
+  r.expire(pro, 60)
+  r.expire("#{pro}:workers", 60)
+end
+```
+
+
 4.1.2
 -----------
 
-- **IMPORTANT** Fix memory leak with worker data in Redis.
+- Fix Redis data leak with worker data when a busy Sidekiq process
+  crashes.  You can find and expire leaked data in Redis with this
+script:
+```bash
+$ redis-cli keys  "*:workers" | while read LINE ; do TTL=`redis-cli expire "$LINE" 60`; echo "$LINE"; done;
+```
+  Please note that `keys` can be dangerous to run on a large, busy Redis.  Caveat runner.
 - Freeze all string literals with Ruby 2.3. [#2741]
 - Client middleware can now stop bulk job push. [#2887]
 

data/Ent-Changes.md

@@ -3,11 +3,17 @@ Sidekiq Enterprise Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
-HEAD
+1.2.2
 -------------
 
 - Add API to check if a unique lock is present. See [#2932] for details.
 - Tune concurrent limiters to minimize thread thrashing under heavy contention. [#2944]
+- Add option for tuning which Bundler groups get preloaded with `sidekiqswarm` [#3025]
+```
+SIDEKIQ_PRELOAD=default,production bin/sidekiqswarm ...
+# Use an empty value for maximum application compatibility
+SIDEKIQ_PRELOAD= bin/sidekiqswarm ...
+```
 
 1.2.1
 -------------

data/Pro-Changes.md

@@ -3,6 +3,26 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+3.3.1
+---------
+
+- If environment is unset, treat it as development so reliable\_fetch works as before 3.2.2.
+
+3.3.0
+---------
+
+- Don't delete batches immediately upon success but set a 24 hr expiry, this allows
+  Sidekiq::Batch::Status#poll to work, even after batch success. [#3011]
+- New `Sidekiq::PendingSet#destroy(jid)` API to remove poison pill jobs [#3015]
+
+3.2.2
+---------
+
+- A default value for -i is only set in development now, staging or
+  other environments must set an index if you wish to use reliable\_fetch. [#2971]
+- Fix nil dereference when checking for jobs over timeout in timed\_fetch
+
+
 3.2.1
 ---------
 

data/lib/sidekiq/client.rb

@@ -84,6 +84,7 @@ module Sidekiq
     # than the number given if the middleware stopped processing for one or more jobs.
     def push_bulk(items)
       arg = items['args'].first
+      return [] unless arg # no jobs to push
       raise ArgumentError, "Bulk arguments must be an Array of Arrays: [[1], [2]]" if !arg.is_a?(Array)
 
       normed = normalize_item(items)

data/lib/sidekiq/launcher.rb

@@ -80,7 +80,7 @@ module Sidekiq
         workers_key = "#{key}:workers".freeze
         nowdate = Time.now.utc.strftime("%Y-%m-%d".freeze)
         Sidekiq.redis do |conn|
-          conn.pipelined do
+          conn.multi do
             conn.incrby("stat:processed".freeze, procd)
             conn.incrby("stat:processed:#{nowdate}", procd)
             conn.incrby("stat:failed".freeze, fails)
@@ -95,7 +95,7 @@ module Sidekiq
         fails = procd = 0
 
         _, _, _, msg = Sidekiq.redis do |conn|
-          conn.pipelined do
+          conn.multi do
             conn.sadd('processes', key)
             conn.hmset(key, 'info', json, 'busy', Processor::WORKER_STATE.size, 'beat', Time.now.to_f, 'quiet', @done)
             conn.expire(key, 60)

data/lib/sidekiq/redis_connection.rb

@@ -8,6 +8,8 @@ module Sidekiq
     class << self
 
       def create(options={})
+        options = options.symbolize_keys
+
         options[:url] ||= determine_redis_provider
 
         size = options[:size] || (Sidekiq.server? ? (Sidekiq.options[:concurrency] + 5) : 5)
@@ -33,7 +35,7 @@ module Sidekiq
       #   - enterprise's leader election
       #   - enterprise's cron support
       def verify_sizing(size, concurrency)
-        raise ArgumentError, "Your Redis connection pool is too small for Sidekiq to work, your pool has #{size} connections but really needs to have at least #{concurrency + 2}" if size <= concurrency
+        raise ArgumentError, "Your Redis connection pool is too small for Sidekiq to work. Your pool has #{size} connections but really needs to have at least #{concurrency + 2}" if size <= concurrency
       end
 
       def build_client(options)
@@ -45,8 +47,8 @@ module Sidekiq
             require 'redis/namespace'
             Redis::Namespace.new(namespace, :redis => client)
           rescue LoadError
-            Sidekiq.logger.error("Your Redis configuration use the namespace '#{namespace}' but the redis-namespace gem not included in Gemfile." \
-                                 "Add the gem to your Gemfile in case you would like to keep using a namespace, otherwise remove the namespace parameter.")
+            Sidekiq.logger.error("Your Redis configuration uses the namespace '#{namespace}' but the redis-namespace gem is not included in the Gemfile." \
+                                 "Add the gem to your Gemfile to continue using a namespace. Otherwise, remove the namespace parameter.")
             exit(-127)
           end
         else

data/lib/sidekiq/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sidekiq
-  VERSION = "4.1.2"
+  VERSION = "4.1.3"
 end

data/sidekiq.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency                  'redis', '~> 3.2', '>= 3.2.1'
   gem.add_dependency                  'connection_pool', '~> 2.2', '>= 2.2.0'
   gem.add_dependency                  'concurrent-ruby', '~> 1.0'
+  gem.add_dependency                  'sinatra', '~> 1.4', '>= 1.4.6'
   gem.add_development_dependency      'redis-namespace', '~> 1.5', '>= 1.5.2'
-  gem.add_development_dependency      'sinatra', '~> 1.4', '>= 1.4.6'
   gem.add_development_dependency      'minitest', '~> 5.7', '>= 5.7.0'
   gem.add_development_dependency      'rake', '~> 10.0'
   gem.add_development_dependency      'rails', '~> 4', '>= 3.2.0'

data/test/test_client.rb

@@ -126,6 +126,10 @@ class TestClient < Sidekiq::Test
         assert_match(/[0-9a-f]{12}/, jid)
       end
     end
+    it 'handles no jobs' do
+      result = Sidekiq::Client.push_bulk('class' => 'QueuedWorker', 'args' => [])
+      assert_equal 0, result.size
+    end
   end
 
   class BaseWorker

data/test/test_redis_connection.rb

@@ -27,11 +27,16 @@ class TestRedisConnection < Sidekiq::Test
     end
 
     describe "namespace" do
-      it "uses a given :namespace" do
+      it "uses a given :namespace set by a symbol key" do
         pool = Sidekiq::RedisConnection.create(:namespace => "xxx")
         assert_equal "xxx", pool.checkout.namespace
       end
 
+      it "uses a given :namespace set by a string key" do
+        pool = Sidekiq::RedisConnection.create("namespace" => "xxx")
+        assert_equal "xxx", pool.checkout.namespace
+      end
+
       it "uses given :namespace over :namespace from Sidekiq.options" do
         Sidekiq.options[:namespace] = "xxx"
         pool = Sidekiq::RedisConnection.create(:namespace => "yyy")

data/web/assets/javascripts/locales/{jquery.timeago.no.js → jquery.timeago.nb.js}

@@ -15,4 +15,4 @@ jQuery.timeago.settings.strings = {
   months: "%d måneder",
   year: "ca. et år",
   years: "%d år"
-};
+};

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -65,45 +65,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: redis-namespace
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :development
+        version: 1.4.6
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.4.6
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +168,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/contributing.md"
+- ".github/issue_template.md"
 - ".gitignore"
 - ".travis.yml"
 - 3.0-Upgrade.md
@@ -289,8 +290,8 @@ files:
 - web/assets/javascripts/locales/jquery.timeago.ko.js
 - web/assets/javascripts/locales/jquery.timeago.lt.js
 - web/assets/javascripts/locales/jquery.timeago.mk.js
+- web/assets/javascripts/locales/jquery.timeago.nb.js
 - web/assets/javascripts/locales/jquery.timeago.nl.js
-- web/assets/javascripts/locales/jquery.timeago.no.js
 - web/assets/javascripts/locales/jquery.timeago.pl.js
 - web/assets/javascripts/locales/jquery.timeago.pt-br.js
 - web/assets/javascripts/locales/jquery.timeago.pt.js