sidekiq 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66911189b7648f87bf3ce6e11f5917d6b242ddcc
-  data.tar.gz: e21cbc6d3f73a9a25df7f2771248205ba457f453
+  metadata.gz: 4895c316f5c9f592745594ac4984e150fbf5ea62
+  data.tar.gz: b78f6b9242d8a981a60d3fbe28a08c3c16b839af
 SHA512:
-  metadata.gz: 16d3851a53e70a270cfd7277817953fa54897dabf0f4f527308bcbcb769d4232d98466bac1477f820472a7cac361326da5563e696481f7a2963471c6cd3119b8
-  data.tar.gz: c687ab3be80e972fd2b98c6d2939c7509506a8516495eabb81d4ae92c6ec939203a28e4bfea99925bd8469f8035f8024010cc6e992aef97e9adc74a256b4b9c4
+  metadata.gz: 9134b87eee18dc46b1e95d9190ee3a3f0d5b9426f5b6953d9b55aee39d9fd6e2441b9133fa797e137d8cfdc50c6e99fbff1c74195fe065ff3d84b4e8869333fe
+  data.tar.gz: 23767242d2d5911526cae5b5061d050a363947cc9f21f7dbc336eb6d5605ab470a0733b2ab6979e33b3dd81969bdd282958ce69f8a6a3a4683fdceb71dfcc4a1

data/.travis.yml

@@ -7,10 +7,10 @@ rvm:
   - 2.1
   - 2.0.0
   - 2.2
-  - jruby-19mode
   - jruby
+  - jruby-head
   - rbx-2
 matrix:
   allow_failures:
     - rvm: rbx-2
-    - rvm: jruby
+    - rvm: jruby-head

data/COMM-LICENSE

@@ -24,6 +24,8 @@ You may not, without Our prior written consent, redistribute the Software or Mod
 
 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.
 
+You may not publicize your unique "Source URL" for Sidekiq Pro.  If your unique Source URL is ever publicized, We reserve the right to terminate your access without notice.
+
 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,3 +1,10 @@
+3.3.3
+-----------
+
+- Fix crash on exit when Redis is down [#2235]
+- Fix duplicate logging on startup
+- Undeprecate delay extension for ActionMailer 4.2+ . [#2186]
+
 3.3.2
 -----------
 

data/Pro-2.0-Upgrade.md

@@ -15,6 +15,9 @@ available.
 **Note that you CANNOT go back to Pro 1.x once you've created batches
 with 2.x.  The new batches will not process correctly with 1.x.**
 
+**If you are on a version of Sidekiq Pro <1.5, you should upgrade to the
+latest 1.x version and run it for a week before upgrading to 2.0.**
+
 ## Nested Batches
 
 Batches can now be nested within the `jobs` method.
@@ -35,7 +38,7 @@ a.jobs do
 end
 ```
 
-Parent batch callbacks are not processed until any child batch callbacks have
+Parent batch callbacks are not processed until all child batch callbacks have
 run successfully.  In the example above, `MyCallback` will always fire
 before `SomeCallback` because `b` is considered a child of `a`.
 
@@ -58,6 +61,8 @@ def perform(*args)
 end
 ```
 
+More context: [#1485]
+
 ## Batch Data
 
 The batch data model was overhauled.  Batch data should take
@@ -78,14 +83,22 @@ savings but real world savings should be even greater.
 **There's no data migration required.  Sidekiq Pro 2.0 transparently handles
 both old and new format.**
 
+More context: [#2130]
+
 ## Reliability
 
 2.0 brings a new reliable scheduler which uses Lua inside Redis so enqueuing
 scheduled jobs is atomic.  Benchmarks show it 50x faster when enqueuing
-lots of jobs.  **One caveat**: client-side middleware is not executed
-for each job when enqueued with the reliable scheduler.  No Sidekiq or
-Sidekiq Pro functionality is affected by this change but some 3rd party
-plugins might be.
+lots of jobs.
+
+**Two caveats**:
+- Client-side middleware is not executed
+  for each job when enqueued with the reliable scheduler.  No Sidekiq or
+  Sidekiq Pro functionality is affected by this change but some 3rd party
+  plugins might be.
+- The Lua script used inside the reliable scheduler is not safe for use
+  with Redis Cluster, Redis Sentinel or other distributed Redis solutions.
+  It is safe to use with a typical master/slave replication setup.
 
 **You no longer require anything to use the Reliability features.**
 
@@ -101,6 +114,8 @@ end
 Sidekiq::Client.reliable_push!
 ```
 
+More context: [#2130]
+
 ## Other Changes
 
 * You must require `sidekiq/pro/notifications` if you want to use the
@@ -109,7 +124,13 @@ Sidekiq::Client.reliable_push!
 * Several classes have been renamed.  Generally these classes are ones
   you should not need to require/use in your own code, e.g. the Batch
   middleware.
-* The Web UI now shows the Sidekiq Pro version in the footer.
+* You can add `attr_accessor :jid` to a Batch callback class and Sidekiq
+  Pro will set it to the jid of the callback job. [#2178]
+* There's now an official API to iterate all known Batches [#2191]
+```ruby
+Sidekiq::BatchSet.new.each {|status| p status.bid }
+```
+* The Web UI now shows the Sidekiq Pro version in the footer. [#1991]
 
 ## Thanks
 

data/Pro-Changes.md

@@ -4,7 +4,15 @@ Sidekiq Pro Changelog
 Please see [http://sidekiq.org/pro](http://sidekiq.org/pro) for more details and how to buy.
 
 
-2.0.0 (unreleased)
+2.0.1
+-----------
+
+- Add `batch.callback_queue` so batch callbacks can use a higher
+  priority queue than jobs. [#2200]
+- Gracefully recover if someone runs `SCRIPT FLUSH` on Redis. [#2240]
+- Ignore errors when attempting `bulk_requeue`, allowing clean shutdown
+
+2.0.0
 -----------
 
 - See [the Upgrade Notes](Pro-2.0-Upgrade.md) for detailed notes.

data/README.md

@@ -1,11 +1,11 @@
 Sidekiq
 ==============
 
-[![Gem Version](https://badge.fury.io/rb/sidekiq.png)](https://rubygems.org/gems/sidekiq) 
-[![Code Climate](https://codeclimate.com/github/mperham/sidekiq.png)](https://codeclimate.com/github/mperham/sidekiq) 
-[![Build Status](https://travis-ci.org/mperham/sidekiq.png)](https://travis-ci.org/mperham/sidekiq) 
-[![Coverage Status](https://coveralls.io/repos/mperham/sidekiq/badge.png?branch=master)](https://coveralls.io/r/mperham/sidekiq) 
-[![Gitter Chat](https://badges.gitter.im/mperham/sidekiq.png)](https://gitter.im/mperham/sidekiq)
+[![Gem Version](https://badge.fury.io/rb/sidekiq.svg)](https://rubygems.org/gems/sidekiq)
+[![Code Climate](https://codeclimate.com/github/mperham/sidekiq.svg)](https://codeclimate.com/github/mperham/sidekiq)
+[![Build Status](https://travis-ci.org/mperham/sidekiq.svg)](https://travis-ci.org/mperham/sidekiq)
+[![Coverage Status](https://coveralls.io/repos/mperham/sidekiq/badge.svg?branch=master)](https://coveralls.io/r/mperham/sidekiq)
+[![Gitter Chat](https://badges.gitter.im/mperham/sidekiq.svg)](https://gitter.im/mperham/sidekiq)
 
 
 Simple, efficient background processing for Ruby.
@@ -46,7 +46,7 @@ Getting Started
 -----------------
 
 See the [sidekiq home page](http://sidekiq.org) for the simple 3-step process.
-You can watch [Railscast #366](http://railscasts.com/episodes/366-sidekiq) to see Sidekiq in action.  If you do everything right, you should see this: 
+You can watch [Railscast #366](http://railscasts.com/episodes/366-sidekiq) to see Sidekiq in action.  If you do everything right, you should see this:
 
 ![Web UI](https://github.com/mperham/sidekiq/raw/master/examples/web-ui.png)
 

data/lib/sidekiq/api.rb

@@ -218,7 +218,7 @@ module Sidekiq
       Time.now.to_f - Sidekiq.load_json(entry)['enqueued_at']
     end
 
-    def each(&block)
+    def each
       initial_size = size
       deleted_size = 0
       page = 0
@@ -233,14 +233,14 @@ module Sidekiq
         break if entries.empty?
         page += 1
         entries.each do |entry|
-          block.call Job.new(entry, @name)
+          yield Job.new(entry, @name)
         end
         deleted_size = initial_size - size
       end
     end
 
     def find_job(jid)
-      self.detect { |j| j.jid == jid }
+      detect { |j| j.jid == jid }
     end
 
     def clear
@@ -341,7 +341,7 @@ module Sidekiq
     def safe_load(content, default)
       begin
         yield(*YAML.load(content))
-      rescue ::ArgumentError => ex
+      rescue => ex
         # #1761 in dev mode, it's possible to have jobs enqueued which haven't been loaded into
         # memory yet so the YAML can't be loaded.
         Sidekiq.logger.warn "Unable to load YAML: #{ex.message}" unless Sidekiq.options[:environment] == 'development'
@@ -474,7 +474,7 @@ module Sidekiq
       end
     end
 
-    def each(&block)
+    def each
       initial_size = @_size
       offset_size = 0
       page = -1
@@ -489,7 +489,7 @@ module Sidekiq
         break if elements.empty?
         page -= 1
         elements.each do |element, score|
-          block.call SortedEntry.new(self, score, element)
+          yield SortedEntry.new(self, score, element)
         end
         offset_size = initial_size - @_size
       end
@@ -651,7 +651,7 @@ module Sidekiq
       count
     end
 
-    def each(&block)
+    def each
       procs = Sidekiq.redis { |conn| conn.smembers('processes') }.sort
 
       Sidekiq.redis do |conn|
@@ -760,7 +760,7 @@ module Sidekiq
   class Workers
     include Enumerable
 
-    def each(&block)
+    def each
       Sidekiq.redis do |conn|
         procs = conn.smembers('processes')
         procs.sort.each do |key|

data/lib/sidekiq/cli.rb

@@ -68,6 +68,11 @@ module Sidekiq
 
       fire_event(:startup)
 
+      Sidekiq.redis do |conn|
+        # touch the connection pool so it is created before we
+        # launch the actors.
+      end
+
       if !options[:daemon]
         logger.info 'Starting processing, hit Ctrl-C to stop'
       end

data/lib/sidekiq/extensions/action_mailer.rb

@@ -28,7 +28,6 @@ module Sidekiq
 
       def deliver(msg)
         if msg.respond_to?(:deliver_now)
-          ActiveSupport::Deprecation.warn('`ActionMailer.delay.method` is deprecated. Use `ActionMailer.method.deliver_later` instead and configure ActiveJob to use Sidekiq.')
           # Rails 4.2/5.0
           msg.deliver_now
         else

data/lib/sidekiq/launcher.rb

@@ -90,6 +90,8 @@ module Sidekiq
           conn.del("#{identity}:workers")
         end
       end
+    rescue
+      # best effort, ignore network errors
     end
 
   end

data/lib/sidekiq/middleware/chain.rb

@@ -120,11 +120,11 @@ module Sidekiq
         entries.clear
       end
 
-      def invoke(*args, &final_action)
+      def invoke(*args)
         chain = retrieve.dup
         traverse_chain = lambda do
           if chain.empty?
-            final_action.call
+            yield
           else
             chain.shift.call(*args, &traverse_chain)
           end

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

@@ -50,7 +50,7 @@ module Sidekiq
       #
       #   Sidekiq.configure_server do |config|
       #     config.server_middleware do |chain|
-      #       chain.add Middleware::Server::RetryJobs, :max_retries => 7
+      #       chain.add Sidekiq::Middleware::Server::RetryJobs, :max_retries => 7
       #     end
       #   end
       #

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "3.3.2"
+  VERSION = "3.3.3"
 end

data/lib/sidekiq/worker.rb

@@ -42,13 +42,13 @@ module Sidekiq
 
       def perform_in(interval, *args)
         int = interval.to_f
-        now = Time.now.to_f
-        ts = (int < 1_000_000_000 ? now + int : int)
+        now = Time.now
+        ts = (int < 1_000_000_000 ? (now + interval).to_f : int)
 
         item = { 'class' => self, 'args' => args, 'at' => ts }
 
         # Optimization to enqueue something now that is scheduled to go out now or in the past
-        item.delete('at'.freeze) if ts <= now
+        item.delete('at'.freeze) if ts <= now.to_f
 
         client_push(item)
       end

data/test/test_api.rb

@@ -24,7 +24,7 @@ class TestApi < Sidekiq::Test
     describe "failed" do
       it "is initially zero" do
         s = Sidekiq::Stats.new
-        assert_equal 0, s.processed
+        assert_equal 0, s.failed
       end
 
       it "returns number of failed jobs" do
@@ -311,8 +311,6 @@ class TestApi < Sidekiq::Test
       add_retry('bob1', same_time)
       add_retry('bob2', same_time)
       r = Sidekiq::RetrySet.new
-      # jobs = r.fetch(same_time)
-      # puts jobs[1].jid
       assert_equal 1, r.fetch(same_time, 'bob1').size
     end
 

data/test/test_scheduling.rb

@@ -30,6 +30,15 @@ class TestScheduling < Sidekiq::Test
       @redis.verify
     end
 
+    it 'schedules a job in one month' do
+      @redis.expect :zadd, true do |key, args|
+        assert_equal 'schedule', key
+        assert_in_delta 1.month.since.to_f, args[0][0].to_f, 1
+      end
+      assert ScheduledWorker.perform_in(1.month, 'mike')
+      @redis.verify
+    end
+
     it 'schedules a job via timestamp' do
       @redis.expect :zadd, true, ['schedule', Array]
       assert ScheduledWorker.perform_in(5.days.from_now, 'mike')

data/web/assets/stylesheets/application.css

@@ -692,3 +692,15 @@ div.interval-slider input {
     top: auto;
   }
 }
+
+.redis-url
+{
+    max-width: 400px;
+    overflow: hidden;
+}
+
+.redis-namespace
+{
+    max-width: 250px;
+    overflow: hidden;
+}

data/web/views/_footer.erb

@@ -6,14 +6,14 @@
             <p class="navbar-text" style="color:white;"><%= product_version %></p>
           </li>
           <li>
-            <p class="navbar-text">Redis: <%= redis_connection %></p>
+            <p class="navbar-text redis-url">Redis: <%= redis_connection %></p>
           </li>
           <li>
             <p class="navbar-text"><%= t('Time') %>: <%= Time.now.utc.strftime('%H:%M:%S UTC') %></p>
           </li>
           <% if namespace %>
               <li>
-                <p class="navbar-text"><%= t('Namespace') %>: <%= namespace %></p>
+                <p class="navbar-text redis-namespace"><%= t('Namespace') %>: <%= namespace %></p>
               </li>
           <% end %>
         </ul>

metadata

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