zuora_connect_oauth_alpha 2 → 2.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2690030bcc5cae84498de1732142c9290aa988ae2ab862a901a387cb9aa0cb71
4
- data.tar.gz: 1328b2fc3ae1d0b61f5d3bbc0abac9cb67adb5ea4f88839c0fd9a53920fd8cae
3
+ metadata.gz: 9ce56d36802cc50b9cdd9fbd468cb83e12c0654c98c069901d98eac53f102b4c
4
+ data.tar.gz: 03f227640fb6a907c4f464dc628b3b04ecbd353e0db4c48e45604b5538ee1347
5
5
  SHA512:
6
- metadata.gz: d5b3f010c31d92e4f0e7ee2e208ca31b2f5b103de53e53a6364afb7602dc6d0894b551138a9cf729aa95ac78009315e0b1ff07fd286df5885763f722c9610db7
7
- data.tar.gz: b0a2dc9acb401029083b2f69303958754c04c922366163b001a4e98a9ef05ee836e8bc3fc5c2684a5b0efdde30f0b0b2a43604876b87af44b4ebbdcf40d7804e
6
+ metadata.gz: 9b4d637f2ca287daaa68590dbebce8e115b290edafcc3bffe854943aaf75bcc12a14a241cc1a910bf6b6ffd20d3a87588c45f44ad12e5ba0c61e099c05285a99
7
+ data.tar.gz: 3b0636782ad08ac8185d5fb52ae9c65e08278e7456d4c7af5e325a3db639c95e85a1926df23660e7d59c227a4ca526c79222ca5eae39f22dfcc2142470eed7a5
@@ -38,18 +38,29 @@ module Resque
38
38
  end
39
39
 
40
40
  def reserve_with_round_robin
41
- qs = rotated_queues
42
- qs.each do |queue|
43
- log! "Checking #{queue}"
44
- if should_work_on_queue?(queue) && @job_in_progress = Resque::Job.reserve(queue)
45
- log! "Found job on #{queue}"
46
- return @job_in_progress
47
- end
48
- # Start the next search at the queue after the one from which we pick a job.
41
+ grouped_queues = queues.sort.group_by{|u| /(\d{1,20})_.*/.match(u) ? /(\d{1,20})_.*/.match(u).captures.first : nil}
42
+
43
+ #Instance queue grouping
44
+ if !grouped_queues.keys.include?(nil) && grouped_queues.keys.size > 0
45
+ @n ||= 0
49
46
  @n += 1
47
+ @n = @n % grouped_queues.keys.size
48
+
49
+ grouped_queues.keys.rotate(@n).each do |key|
50
+ grouped_queues[key].each do |queue|
51
+ log! "Checking #{queue}"
52
+ if should_work_on_queue?(queue) && @job_in_progress = Resque::Job.reserve(queue)
53
+ log! "Found job on #{queue}"
54
+ return @job_in_progress
55
+ end
56
+ end
57
+ @n += 1 # Start the next search at the queue after the one from which we pick a job.
58
+ end
59
+ nil
60
+ else
61
+ return reserve_without_round_robin
50
62
  end
51
-
52
- nil
63
+
53
64
  rescue Exception => e
54
65
  log "Error reserving job: #{e.inspect}"
55
66
  log e.backtrace.join("\n")
@@ -1,4 +1,4 @@
1
1
  module ZuoraConnect
2
- VERSION = "2"
2
+ VERSION = "2.1"
3
3
  end
4
4
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zuora_connect_oauth_alpha
3
3
  version: !ruby/object:Gem::Version
4
- version: '2'
4
+ version: '2.1'
5
5
  platform: ruby
6
6
  authors:
7
7
  - Connect Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-04-03 00:00:00.000000000 Z
11
+ date: 2018-05-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: apartment
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '2'
33
+ version: '2.11'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '2'
40
+ version: '2.11'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: httparty
43
43
  requirement: !ruby/object:Gem::Requirement