sidekiq 2.17.0 → 2.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3c94aa8a163d8572aaa7c04bc1fbdf0b2bb737c
-  data.tar.gz: d7cd0118de313f863b5c6ead2163a47e0cb8cdc9
+  metadata.gz: 24bfd443535efddca7164e0784c5317d25487673
+  data.tar.gz: 24e85e77a30f1e6dba72ae0a965fa63b4b8b5b33
 SHA512:
-  metadata.gz: ce15a352e04acb9be28519faf11a2bbac4cc3deec7467abef232a53679cde91d4a60a5f08bf0143cd3ebde20559e8ee112e2ef270332e27fc8a95814eb7df9cd
-  data.tar.gz: 2ea6a283ea6850816178520608dd37fec6e46ebe72ce933daa02204862f1815d588a02b790b33009c39fe56ff55f90b108f9c445e36875ed8d5f4596c53c4c3a
+  metadata.gz: 8b031f54208e373dcf35a2c4da99a8756b6c5cfa8fe984e9bce4841d01240780dac4f052cdef86474788c23f317f9f54415bb3e2ce9cd1de868a621767291ea2
+  data.tar.gz: b66143b6db4ba974f8d9846728e109b27c3fb95fe3e8aa5182698e2c539e0a4d729b26da3e776d619b72d5c850c8e45e491cd186394d847f5e3cbb0d75e9479f

data/.travis.yml

@@ -4,17 +4,9 @@ services:
 rvm:
   - 1.9.3
   - jruby-19mode
-  - rbx-2.1.1
+  - rbx
   - 2.0.0
-branches:
-  only:
-    - master
-notifications:
-  irc: "irc.freenode.org#sidekiq"
-  email:
-    recipients:
-      - sidekiq@librelist.org
 matrix:
   allow_failures:
     - rvm: jruby-19mode
-    - rvm: rbx-2.1.1
+    - rvm: rbx

data/Changes.md

@@ -1,7 +1,16 @@
+2.17.1
+-----------
+
+- Expose `delay` extension as `sidekiq_delay` also.  This allows you to
+  run Delayed::Job and Sidekiq in the same process, selectively porting
+  `delay` calls to `sidekiq_delay`.  You just need to ensure that
+  Sidekiq is required **before** Delayed::Job in your Gemfile. [#1393]
+- Bump redis client required version to 3.0.6
+- Minor CSS fixes for Web UI
+
 2.17.0
 -----------
 
-- Change USR1 signal handling to exit process as soon as all workers are quiet. [#1358]
 - Change `Sidekiq::Client#push_bulk` to return an array of pushed `jid`s. [#1315, barelyknown]
 - Web UI refactoring to use more API internally (yummy dogfood!)
 - Much faster Sidekiq::Job#delete performance for larger queue sizes

data/Gemfile

@@ -1,2 +1,9 @@
 source 'https://rubygems.org'
 gemspec
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'         # if using anything in the ruby standard library
+  gem 'psych'                    # if using yaml
+  gem 'minitest'                 # if using minitest
+  gem 'rubinius-developer_tools' # if using any of coverage, debugger, profiler
+end

data/Pro-Changes.md

@@ -3,7 +3,31 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/pro](http://sidekiq.org/pro) for more details and how to buy.
 
-HEAD
+1.4.0
+-----------
+
+- Default batch expiration has been extended to 3 days, from 1 day previously.
+- Batches now sort in the Web UI according to expiry time, not creation time.
+- Add user-configurable batch expiry.  If your batches might take longer
+  than 72 hours to process, you can extend the expiration date.
+
+```ruby
+b = Sidekiq::Batch.new
+b.expires_in 5.days
+...
+```
+
+1.3.2
+-----------
+
+- Lazy load Lua scripts so a Redis connection is not required on bootup.
+
+1.3.1
+-----------
+
+- Fix a gemspec packaging issue which broke the Batch UI.
+
+1.3.0
 -----------
 
 Thanks to @jonhyman for his contributions to this Sidekiq Pro release.
@@ -16,12 +40,13 @@ functionality will be unavailable.
   You can now filter retries and scheduled jobs in the Web UI so you
   only see the jobs relevant to your needs.  Queues cannot be filtered;
   Redis does not provide the same SCAN operation on the LIST type.
-  **Redis 2.8 only**
+  **Redis 2.8**
+  ![Filtering](https://f.cloud.github.com/assets/2911/1619465/f47529f2-5657-11e3-8cd1-33899eb72aad.png)
 - SCAN support in the Sidekiq::SortedSet API.  Here's an example that
   finds all jobs which contain the substring "Warehouse::OrderShip"
   and deletes all matching retries.  If the set is large, this API
   will be **MUCH** faster than standard iteration using each.
-  **Redis 2.8 only**
+  **Redis 2.8**
 ```ruby
   Sidekiq::RetrySet.new.scan("Warehouse::OrderShip") do |job|
     job.delete
@@ -33,7 +58,7 @@ functionality will be unavailable.
 - Sidekiq::Batch#remove\_jobs(jid, jid, ...) removes JIDs from the set, allowing early termination of jobs if they become irrelevant according to application logic.
 - Sidekiq::Batch#include?(jid) allows jobs to check if they are still
   relevant to a Batch and exit early if not.
-- Sidekiq::SortedSet#find\_job(jid) now uses server-side Lua **Redis 2.6 only** [jonhyman]
+- Sidekiq::SortedSet#find\_job(jid) now uses server-side Lua if possible **Redis 2.6** [jonhyman]
 - The statsd integration now sets global job counts:
 ```ruby
   jobs.count
@@ -44,6 +69,7 @@ functionality will be unavailable.
 - Change shutdown logic to push leftover jobs in the private queue back
   into the public queue when shutting down with Reliable Fetch.  This
   allows the safe decommission of a Sidekiq Pro process when autoscaling. [jonhyman]
+- Add support for weighted random fetching with Reliable Fetch [jonhyman]
 - Pro now requires Sidekiq 2.17.0
 
 1.2.5
@@ -88,7 +114,7 @@ functionality will be unavailable.
 - Fix issue with reliable\_push where it didn't return the JID for a pushed
   job when sending previously cached jobs to Redis.
 - Add fast Sidekiq::Queue#delete\_job(jid) API which leverages Lua so job lookup is
-  100% server-side.  Benchmark vs Sidekiq's Job#delete API:
+  100% server-side.  Benchmark vs Sidekiq's Job#delete API. **Redis 2.6**
 
 ```
 Sidekiq Pro API
@@ -98,7 +124,7 @@ Sidekiq API
 ```
 
 - Add fast Sidekiq::Queue#delete\_by\_class(klass) API to remove all
-  jobs of a given type.  Uses server-side Lua for performance.
+  jobs of a given type.  Uses server-side Lua for performance. **Redis 2.6**
 
 1.1.0
 -----------

data/README.md

@@ -60,9 +60,9 @@ quality open source development all at the same time.  Please see the
 More Information
 -----------------
 
-Please see the [sidekiq wiki](https://github.com/mperham/sidekiq/wiki) for more information.
+Please see the [sidekiq wiki](https://github.com/mperham/sidekiq/wiki) for the official documentation.
 [#sidekiq on irc.freenode.net](irc://irc.freenode.net/#sidekiq) is dedicated to this project,
-but bug reports or feature requests suggestions should still go through [issues on Github](https://github.com/mperham/sidekiq/issues).
+but bug reports or feature requests suggestions should still go through [issues on Github](https://github.com/mperham/sidekiq/issues).  Release announcements are made to [@sidekiq](https://twitter.com/sidekiq)
 
 There's also a mailing list via [Librelist](http://librelist.org) that you can subscribe to by sending
 an email to <sidekiq@librelist.org> with a greeting in the body. To unsubscribe, send an email to <sidekiq-unsubscribe@librelist.org> and that's it!
@@ -87,4 +87,4 @@ Please see [LICENSE](https://github.com/mperham/sidekiq/blob/master/LICENSE) for
 Author
 -----------------
 
-Mike Perham, [@mperham](https://twitter.com/mperham), [http://mikeperham.com](http://mikeperham.com)
+Mike Perham, [@mperham](https://twitter.com/mperham) / [@sidekiq](https://twitter.com/sidekiq), [http://mikeperham.com](http://mikeperham.com)

data/lib/sidekiq/extensions/action_mailer.rb

@@ -22,15 +22,18 @@ module Sidekiq
     end
 
     module ActionMailer
-      def delay(options={})
+      def sidekiq_delay(options={})
         Proxy.new(DelayedMailer, self, options)
       end
-      def delay_for(interval, options={})
+      def sidekiq_delay_for(interval, options={})
         Proxy.new(DelayedMailer, self, options.merge('at' => Time.now.to_f + interval.to_f))
       end
-      def delay_until(timestamp, options={})
+      def sidekiq_delay_until(timestamp, options={})
         Proxy.new(DelayedMailer, self, options.merge('at' => timestamp.to_f))
       end
+      alias_method :delay, :sidekiq_delay
+      alias_method :delay_for, :sidekiq_delay_for
+      alias_method :delay_until, :sidekiq_delay_until
     end
 
   end

data/lib/sidekiq/extensions/active_record.rb

@@ -21,15 +21,18 @@ module Sidekiq
     end
 
     module ActiveRecord
-      def delay(options={})
+      def sidekiq_delay(options={})
         Proxy.new(DelayedModel, self, options)
       end
-      def delay_for(interval, options={})
+      def sidekiq_delay_for(interval, options={})
         Proxy.new(DelayedModel, self, options.merge('at' => Time.now.to_f + interval.to_f))
       end
-      def delay_until(timestamp, options={})
+      def sidekiq_delay_until(timestamp, options={})
         Proxy.new(DelayedModel, self, options.merge('at' => timestamp.to_f))
       end
+      alias_method :delay, :sidekiq_delay
+      alias_method :delay_for, :sidekiq_delay_for
+      alias_method :delay_until, :sidekiq_delay_until
     end
 
   end

data/lib/sidekiq/extensions/class_methods.rb

@@ -19,15 +19,18 @@ module Sidekiq
     end
 
     module Klass
-      def delay(options={})
+      def sidekiq_delay(options={})
         Proxy.new(DelayedClass, self, options)
       end
-      def delay_for(interval, options={})
+      def sidekiq_delay_for(interval, options={})
         Proxy.new(DelayedClass, self, options.merge('at' => Time.now.to_f + interval.to_f))
       end
-      def delay_until(timestamp, options={})
+      def sidekiq_delay_until(timestamp, options={})
         Proxy.new(DelayedClass, self, options.merge('at' => timestamp.to_f))
       end
+      alias_method :delay, :sidekiq_delay
+      alias_method :delay_for, :sidekiq_delay_for
+      alias_method :delay_until, :sidekiq_delay_until
     end
 
   end

data/lib/sidekiq/fetch.rb

@@ -93,6 +93,8 @@ module Sidekiq
     # By leaving this as a class method, it can be pluggable and used by the Manager actor. Making it
     # an instance method will make it async to the Fetcher actor
     def self.bulk_requeue(inprogress, options)
+      return if inprogress.empty?
+
       Sidekiq.logger.debug { "Re-queueing terminated jobs" }
       jobs_to_requeue = {}
       inprogress.each do |unit_of_work|

data/lib/sidekiq/manager.rb

@@ -167,6 +167,7 @@ module Sidekiq
           requeue
 
           logger.warn { "Terminating #{@busy.size} busy worker threads" }
+          logger.warn { "Work still in progress #{@in_progress.values.inspect}" }
           @busy.each do |processor|
             if processor.alive? && t = @threads.delete(processor.object_id)
               t.raise Shutdown

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.17.0"
+  VERSION = "2.17.1"
 end

data/sidekiq.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.name          = "sidekiq"
   gem.require_paths = ["lib"]
   gem.version       = Sidekiq::VERSION
-  gem.add_dependency                  'redis', '>= 3.0.4'
+  gem.add_dependency                  'redis', '>= 3.0.6'
   gem.add_dependency                  'redis-namespace', '>= 1.3.1'
   gem.add_dependency                  'connection_pool', '>= 1.0.0'
   gem.add_dependency                  'celluloid', '>= 0.15.2'

data/test/test_manager.rb

@@ -11,7 +11,7 @@ class TestManager < Sidekiq::Test
     end
 
     it 'assigns work to a processor' do
-      uow = Minitest::Mock.new
+      uow = Object.new
       processor = Minitest::Mock.new
       processor.expect(:async, processor, [])
       processor.expect(:process, nil, [uow])

data/test/test_web.rb

@@ -398,7 +398,7 @@ class TestWeb < Sidekiq::Test
       score = Time.now.to_f
       msg = { 'class' => 'HardWorker',
               'args' => ['bob', 1, Time.now.to_f],
-              'jid' => 'f39af2a05e8f4b24dbc0f1e4' }
+              'jid' => SecureRandom.hex(12) }
       Sidekiq.redis do |conn|
         conn.zadd('schedule', score, Sidekiq.dump_json(msg))
       end
@@ -413,7 +413,7 @@ class TestWeb < Sidekiq::Test
               'error_class' => 'RuntimeError',
               'retry_count' => 0,
               'failed_at' => Time.now.utc,
-              'jid' => 'f39af2a05e8f4b24dbc0f1e4'}
+              'jid' => SecureRandom.hex(12) }
       score = Time.now.to_f
       Sidekiq.redis do |conn|
         conn.zadd('retry', score, Sidekiq.dump_json(msg))
@@ -429,7 +429,7 @@ class TestWeb < Sidekiq::Test
               'error_class' => 'RuntimeError',
               'retry_count' => 0,
               'failed_at' => Time.now.utc,
-              'jid' => 'f39af2a05e8f4b24dbc0f1e4'}
+              'jid' => SecureRandom.hex(12) }
       score = Time.now.to_f
       Sidekiq.redis do |conn|
         conn.zadd('retry', score, Sidekiq.dump_json(msg))

data/web/assets/stylesheets/application.css

@@ -188,15 +188,16 @@ td form {
   margin-bottom: 0;
 }
 
-td.table-checkbox {
+.table tr > td.table-checkbox, .table tr > th.table-checkbox {
   padding: 0px;
 }
 
-td.table-checkbox label {
+table .table-checkbox label {
   height: 100%;
   width: 100%;
-  padding: 8px;
+  padding: 0px 16px;
   margin-bottom: 0;
+  line-height: 32px;
 }
 
 .navbar .navbar-brand {
@@ -897,8 +898,11 @@ img.smallogo {
   background: rgba(255, 255, 255, 0.2);
   border-radius: 3px;
 }
+.code-wrap {
+  white-space: normal;
+}
 .args {
-  overflow-y: scroll;
+  overflow-y: auto;
   max-height: 100px;
 }
 .args-extended {

data/web/views/_job_info.erb

@@ -19,7 +19,7 @@
     <tr>
       <th><%= t('Arguments') %></th>
       <td>
-        <code>
+        <code class="code-wrap">
           <!-- We don't want to truncate any job arguments when viewing a single job's status page -->
           <div class="args-extended"><%= display_args(job['args'], nil) %></div>
         </code>

data/web/views/retries.erb

@@ -15,8 +15,10 @@
     <table class="table table-striped table-bordered table-white">
       <thead>
         <tr>
-          <th width="20px">
-            <input type="checkbox" class="check_all" />
+          <th width="20px" class="table-checkbox">
+            <label>
+              <input type="checkbox" class="check_all" />
+            </label>
           </th>
           <th width="25%"><%= t('NextRetry') %></th>
           <th width="11%"><%= t('RetryCount') %></th>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 2.17.1
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-24 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement