sidekiq-paquet 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35c556ed0ee47013d0f13561482370c88dcaf3b5
-  data.tar.gz: c7022eb0f618b007728cc1413a05d425ceca7935
+  metadata.gz: 7eb372865881c4a07f7ee7f46adb11498cdfcf59
+  data.tar.gz: e33bc204a400778044a1646b82dcf74a01e4586b
 SHA512:
-  metadata.gz: c463d405e10729dc857e4311caa92927f72b559178daabb4ea69858405f9006a2d1f0d09c24aa5bde7e99be78b9fd929f14ca1e5f4da719f7841f82df8294dd8
-  data.tar.gz: 847f0252d19512db6f4f3b6ac5832861e58427e92c5c24454b93211c22d2dad3672cf5414972af69e4a257364b3bd417f17adb5e468deeeef78d356a5099c3ae
+  metadata.gz: fe89c8007bef35dce232830315b780c228be6ad15318bde3acca2eb1ecac0e1e7c95b90ba24926db556fdbde8fe271794c6a1d2789f2a4e7c7cc690506157f8e
+  data.tar.gz: 7e38ea126519a21efd36f241f61cd7ec84a2299c55e455884d2292984b852d8d24f8dadd4859504d9300433d7ca5f728ebea25ebb67477b37986636c7896bf96

data/lib/sidekiq/paquet.rb

@@ -30,7 +30,7 @@ module Sidekiq
     end
 
     def self.initial_wait
-      options[:initial_wait] + (5 * rand)
+      options[:initial_wait] + (10 * rand)
     end
   end
 end

data/lib/sidekiq/paquet/bundle.rb

@@ -8,26 +8,25 @@ module Sidekiq
 
         Sidekiq.redis do |conn|
           conn.multi do
-            if Paquet.options[:compatibility_mode]
-              conn.zadd('bundles'.freeze, 0, worker_name)
-            else
-              conn.zadd('bundles'.freeze, 0, worker_name, nx: true)
-            end
+            conn.zadd('bundles'.freeze, 0, worker_name)
             conn.rpush("bundle:#{worker_name}", Sidekiq.dump_json(args))
           end
         end
       end
 
       def self.enqueue_jobs
-        now = Time.now.to_f
         Sidekiq.redis do |conn|
-          workers = conn.zrangebyscore('bundles'.freeze, '-inf', now)
+          workers = conn.zrange('bundles'.freeze, 0, -1)
 
           workers.each do |worker|
             klass = worker.constantize
             opts  = klass.get_sidekiq_options
             min_interval = opts['minimum_execution_interval'.freeze]
 
+            if min_interval
+              next unless conn.set("bundle:#{worker}:next", 'queue'.freeze, nx: true, ex: min_interval)
+            end
+
             items = conn.lrange("bundle:#{worker}", 0, -1)
             items.map! { |i| Sidekiq.load_json(i) }
 
@@ -40,7 +39,6 @@ module Sidekiq
             end
 
             conn.ltrim("bundle:#{worker}", items.size, -1)
-            conn.zadd('bundles'.freeze, now + min_interval, worker) if !Paquet.options[:compatibility_mode] && min_interval
           end
         end
       end

data/lib/sidekiq/paquet/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Paquet
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-paquet
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - ccocchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq