sidekiq 2.17.5 → 2.17.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f45fd360f6855464c593e4fb45908eb33dcb0efe
-  data.tar.gz: b635fac989f62f29bd4f7f740343851560bb6829
+  metadata.gz: 0d42c2e9a872cd5b00e30147f9d72aa587dc2a33
+  data.tar.gz: 0d8a3223a321ae8aff8da8c468ca43a14bd0a851
 SHA512:
-  metadata.gz: b56a2d5b412234622fc5e531c5402d5b9c8251373250eaadaa8c37a3918145d1afd740ee4b9311ce9bcb0fa08fd172a397a5ba3ab97c3271541a11a0524c2898
-  data.tar.gz: d1e0f55a98d11c4d15a4e3bec401ac571e482b1973869c66f7f40a433895aabb8a920085d5341c9ecc0f873d28f76925ea72dffa2884286ad26b61865e80e5a4
+  metadata.gz: 042f1408d57e3327c9391543e2bbf0e4d6f02ba7d7f3db9f7beccb4d91ef54d165d14b210b0b0d2b3b6be69e6212e1f72fc51648d3a71fb17959dbfd78d08d29
+  data.tar.gz: e663acb2a1fbf05ef5ca4ccae9adc2d9704610f3e281be4072a1621538b2b0507f9bc37958bb397eb3af45af6df12d4b4db76dd7da605513adb10857f1f2863a

data/Changes.md

@@ -1,3 +1,8 @@
+2.17.6
+-----------
+
+- Fix capistrano integration due to missing pidfile. [#1490]
+
 2.17.5
 -----------
 

data/Pro-Changes.md

@@ -3,10 +3,11 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/pro](http://sidekiq.org/pro) for more details and how to buy.
 
-HEAD
+1.4.3
 -----------
 
 - Reverse sorting of Batches in Web UI [#1098]
+- Refactoring for Sidekiq 3.0, Pro now requires Sidekiq 2.17.5
 
 1.4.2
 -----------

data/bin/sidekiqctl

@@ -12,7 +12,7 @@ class Sidekiqctl
     @timeout = timeout
 
     done('No pidfile given', :error) if !pidfile
-    done("Pidfile #{pidfile} does not exist", :error) if !File.exist?(pidfile)
+    done("Pidfile #{pidfile} does not exist", :warn) if !File.exist?(pidfile)
     done('Invalid pidfile content', :error) if pid == 0
 
     fetch_process
@@ -40,7 +40,7 @@ class Sidekiqctl
   end
 
   def pid
-    File.read(pidfile).to_i
+    @pid ||= File.read(pidfile).to_i
   end
 
   def quiet

data/lib/sidekiq/api.rb

@@ -231,8 +231,10 @@ module Sidekiq
 
     def add_to_queue
       Sidekiq.redis do |conn|
-        results = conn.zrangebyscore('schedule', score, score)
-        conn.zremrangebyscore('schedule', score, score)
+        results = conn.multi do
+          conn.zrangebyscore('schedule', score, score)
+          conn.zremrangebyscore('schedule', score, score)
+        end.first
         results.map do |message|
           msg = Sidekiq.load_json(message)
           Sidekiq::Client.push(msg)
@@ -243,8 +245,10 @@ module Sidekiq
     def retry
       raise "Retry not available on jobs not in the Retry queue." unless item["failed_at"]
       Sidekiq.redis do |conn|
-        results = conn.zrangebyscore('retry', score, score)
-        conn.zremrangebyscore('retry', score, score)
+        results = conn.multi do
+          conn.zrangebyscore('retry', score, score)
+          conn.zremrangebyscore('retry', score, score)
+        end.first
         results.map do |message|
           msg = Sidekiq.load_json(message)
           msg['retry_count'] = msg['retry_count'] - 1
@@ -420,10 +424,7 @@ module Sidekiq
       Sidekiq.redis do |conn|
         workers = conn.smembers("workers")
         workers.each do |w|
-          msg, time = conn.multi do
-            conn.get("worker:#{w}")
-            conn.get("worker:#{w}:started")
-          end
+          msg, time = conn.mget("worker:#{w}", "worker:#{w}:started")
           next unless msg
           block.call(w, Sidekiq.load_json(msg), time)
         end

data/lib/sidekiq/cli.rb

@@ -46,8 +46,12 @@ module Sidekiq
       self_read, self_write = IO.pipe
 
       %w(INT TERM USR1 USR2 TTIN).each do |sig|
-        trap sig do
-          self_write.puts(sig)
+        begin
+          trap sig do
+            self_write.puts(sig)
+          end
+        rescue ArgumentError
+          puts "Signal #{sig} not supported"
         end
       end
 

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.17.5"
+  VERSION = "2.17.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.17.5
+  version: 2.17.6
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-15 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis