sidekiq-paquet 0.2.2 → 0.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 35c556ed0ee47013d0f13561482370c88dcaf3b5
4
- data.tar.gz: c7022eb0f618b007728cc1413a05d425ceca7935
3
+ metadata.gz: 7eb372865881c4a07f7ee7f46adb11498cdfcf59
4
+ data.tar.gz: e33bc204a400778044a1646b82dcf74a01e4586b
5
5
  SHA512:
6
- metadata.gz: c463d405e10729dc857e4311caa92927f72b559178daabb4ea69858405f9006a2d1f0d09c24aa5bde7e99be78b9fd929f14ca1e5f4da719f7841f82df8294dd8
7
- data.tar.gz: 847f0252d19512db6f4f3b6ac5832861e58427e92c5c24454b93211c22d2dad3672cf5414972af69e4a257364b3bd417f17adb5e468deeeef78d356a5099c3ae
6
+ metadata.gz: fe89c8007bef35dce232830315b780c228be6ad15318bde3acca2eb1ecac0e1e7c95b90ba24926db556fdbde8fe271794c6a1d2789f2a4e7c7cc690506157f8e
7
+ data.tar.gz: 7e38ea126519a21efd36f241f61cd7ec84a2299c55e455884d2292984b852d8d24f8dadd4859504d9300433d7ca5f728ebea25ebb67477b37986636c7896bf96
@@ -30,7 +30,7 @@ module Sidekiq
30
30
  end
31
31
 
32
32
  def self.initial_wait
33
- options[:initial_wait] + (5 * rand)
33
+ options[:initial_wait] + (10 * rand)
34
34
  end
35
35
  end
36
36
  end
@@ -8,26 +8,25 @@ module Sidekiq
8
8
 
9
9
  Sidekiq.redis do |conn|
10
10
  conn.multi do
11
- if Paquet.options[:compatibility_mode]
12
- conn.zadd('bundles'.freeze, 0, worker_name)
13
- else
14
- conn.zadd('bundles'.freeze, 0, worker_name, nx: true)
15
- end
11
+ conn.zadd('bundles'.freeze, 0, worker_name)
16
12
  conn.rpush("bundle:#{worker_name}", Sidekiq.dump_json(args))
17
13
  end
18
14
  end
19
15
  end
20
16
 
21
17
  def self.enqueue_jobs
22
- now = Time.now.to_f
23
18
  Sidekiq.redis do |conn|
24
- workers = conn.zrangebyscore('bundles'.freeze, '-inf', now)
19
+ workers = conn.zrange('bundles'.freeze, 0, -1)
25
20
 
26
21
  workers.each do |worker|
27
22
  klass = worker.constantize
28
23
  opts = klass.get_sidekiq_options
29
24
  min_interval = opts['minimum_execution_interval'.freeze]
30
25
 
26
+ if min_interval
27
+ next unless conn.set("bundle:#{worker}:next", 'queue'.freeze, nx: true, ex: min_interval)
28
+ end
29
+
31
30
  items = conn.lrange("bundle:#{worker}", 0, -1)
32
31
  items.map! { |i| Sidekiq.load_json(i) }
33
32
 
@@ -40,7 +39,6 @@ module Sidekiq
40
39
  end
41
40
 
42
41
  conn.ltrim("bundle:#{worker}", items.size, -1)
43
- conn.zadd('bundles'.freeze, now + min_interval, worker) if !Paquet.options[:compatibility_mode] && min_interval
44
42
  end
45
43
  end
46
44
  end
@@ -1,5 +1,5 @@
1
1
  module Sidekiq
2
2
  module Paquet
3
- VERSION = '0.2.2'
3
+ VERSION = '0.2.3'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sidekiq-paquet
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.2
4
+ version: 0.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - ccocchi
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-06-14 00:00:00.000000000 Z
11
+ date: 2016-06-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sidekiq