sidekiq 2.17.3 → 2.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b68667363a8350377be91d5594c81b4ee780e020
-  data.tar.gz: 0271205154c7e94ed068e0336edb62f63c174552
+  metadata.gz: f0aa7427773926eb8405b61c3f23ca7f76d2c30a
+  data.tar.gz: 4718ae00e33055fa689059cbfa1f9ef376849109
 SHA512:
-  metadata.gz: 340d77c4c89ae83686d3138668e5dace15433185984910e2b408ea3d28ef269db4d61d3ad70eee0f0f1db86e731da648b98e3bb9109add6761114eedb9712de0
-  data.tar.gz: d9db8af31e75b3a3739e31869f96703721056ac1b4958f21dffe538d4afa1f3f41e7dcf05edd21e899e0ee3ae1335704f33970d445afa928c883fac1ff0fbe4e
+  metadata.gz: fc0f9e9373b76a5c9944e00de83edada7a886181d49ce11f70582cb6a8f2c35514d350dd6987d26abbe92ae91639661d414be1ba76e6f509577fb461c2396319
+  data.tar.gz: d6efd568f255aac569dc64f9de9fe73984a76aaf72413551f977ba1f2037eee4dfc7350209d06bf66fc19a3ab5e8b250985ff27eff3cec8d8ccfcbc494c14d10

data/COMM-LICENSE

@@ -6,8 +6,6 @@ This is a license agreement and not an agreement for sale. We reserve ownership
 
 Subject to the payment of the fee required and subject to the terms and conditions of this License Agreement, We grant to You a revocable, non- transferable and non-exclusive license (i) for Designated User(s) (as defined below) within Your organization to install and use the Software on any workstations used exclusively by such Designated User and (ii) for You to install and use the Software in connection with unlimited domains and sub-domains on unlimited servers, solely in connection with distribution of the Software in accordance with sections 3 and 4 below. This license is not sublicensable except as explicitly set forth herein. “Designated User(s)” shall mean Your employee(s) acting within the scope of their employment or Your consultant(s) or contractor(s) acting within the scope of the services they provide for You or on Your behalf for whom You have purchased a license to use the Software.
 
-In addition to the other terms contained herein, We grant to You a revocable, non- transferable and non-exclusive license to install and use the Software on a single computer (the “Trial License”) strictly for Your internal evaluation and review purposes and not for production purposes. This Trial License applies only if You have registered with Us for a Trial License of the Software and shall be effective for forty-five (45) consecutive days following the date of registration (“the Trial Period”). You may only register for a Trial License once in any eighteen month period. You agree not to use a Trial License for any purpose other than determining whether to purchase a license to the Software. You are explicitly not permitted to distribute the Software to any user outside the Organization on whose behalf you have undertaken this license. Your rights to use the Trial License will immediately terminate upon the earlier of (i) the expiration of the Trial Period, or (ii) such time that You purchase a license to the Software. We reserve the right to terminate Your Trial License at any time in Our absolute and sole discretion.
-
 2. PERMITTED USES, SOURCE CODE, MODIFICATIONS
 
 We provide You with source code so that You can create Modifications of the original Software, where Modification means: a) any addition to or deletion from the contents of a file included in the original Software or previous Modifications created by You, or b) any new file that contains any part of the original Software or previous Modifications. While You retain all rights to any original work authored by You as part of the Modifications, We continue to own all copyright and other intellectual property rights in the Software.
@@ -24,6 +22,8 @@ You will not owe Us any royalties for Your distribution of the Software in accor
 
 You may not, without Our prior written consent, redistribute the Software or Modifications other than by including the Software or a portion thereof within Your own product, which must have substantially different functionality than the Software or Modifications and must not allow any third party to use the Software or Modifications, or any portions thereof, for software development or application development purposes. You are explicitly not allowed to redistribute the Software or Modifications as part of any product that can be described as a development toolkit or library, an application builder, a website builder or any product that is intended for use by software, application, or website developers or designers. You are not allowed to redistribute any part of the Software documentation. You may not change or remove the copyright notice from any of the files included in the Software or Modifications.
 
+You may not redistribute the Software as part of a product, "appliance" or "virtual server".  You may not redistribute the Software on any server which is not directly under Your control.
+
 UNDER NO CIRCUMSTANCES MAY YOU USE THE SOFTWARE FOR A PRODUCT THAT IS INTENDED FOR SOFTWARE OR APPLICATION DEVELOPMENT PURPOSES.
 
 The Open Source version of the Software (“LGPL Version”) is licensed

data/Changes.md

@@ -1,15 +1,27 @@
+2.17.4
+-----------
+
+- Fix JID support in inline testing, #1454
+- Polish worker arguments display in UI, #1453
+- Marshal arguments fully to avoid worker mutation, #1452
+- Support reverse paging sorted sets, #1098
+
+
 2.17.3
 -----------
 
-- Synchronously shut down Fetcher and Poller to ensure they don't deliver
-  jobs after Manager is shut down. [#1423]
+- Synchronously terminates the poller and fetcher to fix a race condition in bulk requeue during shutdown [#1406]
 
 2.17.2
 -----------
 
-- Fix race condition in bulk requeue during shutdown [#1406]
 - Fix bug where strictly prioritized queues might be processed out of
-  order [#1408]
+  order [#1408]. A side effect of this change is that it breaks a queue
+  declaration syntax that worked, although only because of a bug—it was
+  never intended to work and never supported. If you were declaring your
+  queues as a  comma-separated list, e.g. `sidekiq -q critical,default,low`,
+  you must now use the `-q` flag before each queue, e.g.
+  `sidekiq -q critical -q default -q low`.
 
 2.17.1
 -----------

data/Pro-Changes.md

@@ -3,6 +3,12 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/pro](http://sidekiq.org/pro) for more details and how to buy.
 
+1.4.2
+-----------
+
+- Tolerate expired Batches in the web UI.
+- Fix 100% CPU usage when using weighted queues and reliable fetch.
+
 1.4.1
 -----------
 

data/lib/sidekiq/paginator.rb

@@ -1,6 +1,6 @@
 module Sidekiq
   module Paginator
-    def page(key, pageidx=1, page_size=25)
+    def page(key, pageidx=1, page_size=25, opts=nil)
       current_page = pageidx.to_i < 1 ? 1 : pageidx.to_i
       pageidx = current_page - 1
       total_size = 0
@@ -13,11 +13,20 @@ module Sidekiq
 
         case type
         when 'zset'
-          total_size = conn.zcard(key)
-          items = conn.zrange(key, starting, ending, :with_scores => true)
+          rev = opts.try(:[], :reverse)
+          total_size, items = conn.multi do
+            conn.zcard(key)
+            if rev
+              conn.zrevrange(key, starting, ending, :with_scores => true)
+            else
+              conn.zrange(key, starting, ending, :with_scores => true)
+            end
+          end
         when 'list'
-          total_size = conn.llen(key)
-          items = conn.lrange(key, starting, ending)
+          total_size, items = conn.multi do
+            conn.llen(key)
+            conn.lrange(key, starting, ending)
+          end
         when 'none'
           return [1, 0, []]
         else

data/lib/sidekiq/processor.rb

@@ -131,13 +131,11 @@ module Sidekiq
     # Singleton classes are not clonable.
     SINGLETON_CLASSES = [ NilClass, TrueClass, FalseClass, Symbol, Fixnum, Float, Bignum ].freeze
 
-    # Clone the arguments passed to the worker so that if
+    # Deep clone the arguments passed to the worker so that if
     # the message fails, what is pushed back onto Redis hasn't
     # been mutated by the worker.
     def cloned(ary)
-      ary.map do |val|
-        SINGLETON_CLASSES.include?(val.class) ? val : val.clone
-      end
+      Marshal.load(Marshal.dump(ary))
     end
   end
 end

data/lib/sidekiq/tasks/sidekiq.rake

@@ -10,7 +10,7 @@ namespace :load do
     set :sidekiq_cmd,           ->{  }
     set :sidekiqctl_cmd,        ->{  }
 
-    # must be relative to Rails.root. If this changes, you'll need to manually
+    # If this changes, you'll need to manually
     # stop the existing sidekiq process.
     set :sidekiq_pid,             ->{ "tmp/sidekiq.pid" }
 
@@ -36,6 +36,14 @@ namespace :sidekiq do
     end
   end
 
+  def pid_full_path(pid_path)
+    if pid_path.start_with?("/")
+      pid_path
+    else
+      "#{current_path}/#{pid_path}"
+    end
+  end
+
   task :add_default_hooks do
     after 'deploy:starting',  'sidekiq:quiet'
     after 'deploy:updated',   'sidekiq:stop'
@@ -47,12 +55,12 @@ namespace :sidekiq do
   task :quiet do
     on roles fetch(:sidekiq_role) do
       for_each_process do |pid_file, idx|
-        if test "[ -f #{current_path}/#{pid_file} ]"
+        if test "[ -f #{pid_full_path(pid_file)} ]"
           within current_path do
             if fetch(:sidekiqctl_cmd)
-              execute fetch(:sidekiqctl_cmd), 'quiet', "#{current_path}/#{pid_file}"
+              execute fetch(:sidekiqctl_cmd), 'quiet', "#{pid_full_path(pid_file)}"
             else
-              execute :bundle, :exec, :sidekiqctl, 'quiet', "#{current_path}/#{pid_file}"
+              execute :bundle, :exec, :sidekiqctl, 'quiet', "#{pid_full_path(pid_file)}"
             end
           end
         end
@@ -64,12 +72,12 @@ namespace :sidekiq do
   task :stop do
     on roles fetch(:sidekiq_role) do
       for_each_process do |pid_file, idx|
-        if test "[ -f #{current_path}/#{pid_file} ]"
+        if test "[ -f #{pid_full_path(pid_file)} ]"
           within current_path do
             if fetch(:sidekiqctl_cmd)
-              execute fetch(:sidekiqctl_cmd), 'stop', "#{current_path}/#{pid_file}", fetch(:sidekiq_timeout)
+              execute fetch(:sidekiqctl_cmd), 'stop', "#{pid_full_path(pid_file)}", fetch(:sidekiq_timeout)
             else
-              execute :bundle, :exec, :sidekiqctl, 'stop', "#{current_path}/#{pid_file}", fetch(:sidekiq_timeout)
+              execute :bundle, :exec, :sidekiqctl, 'stop', "#{pid_full_path(pid_file)}", fetch(:sidekiq_timeout)
             end
           end
         end
@@ -84,9 +92,9 @@ namespace :sidekiq do
       within current_path do
         for_each_process do |pid_file, idx|
           if fetch(:sidekiq_cmd)
-            execute fetch(:sidekiq_cmd), "-d -i #{idx} -P #{pid_file} #{fetch(:sidekiq_options)}"
+            execute fetch(:sidekiq_cmd), "-d -i #{idx} -P #{pid_full_path(pid_file)} #{fetch(:sidekiq_options)}"
           else
-            execute :bundle, :exec, :sidekiq, "-d -i #{idx} -P #{pid_file} #{fetch(:sidekiq_options)}"
+            execute :bundle, :exec, :sidekiq, "-d -i #{idx} -P #{pid_full_path(pid_file)} #{fetch(:sidekiq_options)}"
           end
         end
       end

data/lib/sidekiq/testing.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Sidekiq
 
   class Testing
@@ -64,8 +66,11 @@ module Sidekiq
         true
       elsif Sidekiq::Testing.inline?
         payloads.each do |item|
+          jid = item['jid'] || SecureRandom.hex(12)
           marshalled = Sidekiq.load_json(Sidekiq.dump_json(item))
-          marshalled['class'].constantize.new.perform(*marshalled['args'])
+          worker = marshalled['class'].constantize.new
+          worker.jid = jid
+          worker.perform(*marshalled['args'])
         end
         true
       else

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.17.3"
+  VERSION = "2.17.4"
 end

data/test/test_testing_inline.rb

@@ -17,6 +17,7 @@ class TestInline < Sidekiq::Test
     class InlineWorker
       include Sidekiq::Worker
       def perform(pass)
+        raise ArgumentError, "no jid" unless jid
         raise InlineError unless pass
       end
     end

data/web/views/_workers.erb

@@ -12,16 +12,9 @@
       <td>
         <a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a>
       </td>
-
       <td><%= msg['payload']['class'] %></td>
       <td>
-        <% if msg['payload']['args'].to_s.size > 100 %>
-          <%= h(msg['payload']['args'].inspect[0..100]) + "... " %>
-          <button data-toggle="collapse" data-target="#worker_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
-          <div class="toggle" id="worker_<%= index %>" style="display: none;max-width: 750px;"><%= h(msg['payload']['args']) %></div>
-        <% else %>
-          <%= h(msg['payload']['args']) %>
-        <% end %>
+        <div class="args"><%= display_args(msg['payload']['args']) %></div>
       </td>
       <td><%= relative_time(msg['run_at'].is_a?(Numeric) ? Time.at(msg['run_at']) : Time.parse(msg['run_at'])) %></td>
     </tr>

metadata

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