zuora_connect 1.7.55 → 1.7.56
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 +4 -4
- data/lib/resque/dynamic_queues.rb +3 -4
- data/lib/zuora_connect/configuration.rb +2 -1
- data/lib/zuora_connect/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d93ac703523805e82539fc75891cc060ed44f25d
|
|
4
|
+
data.tar.gz: 957b0d4de13c8ab8bcc9091a95fb3cf8debeb1b3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7c0b7614b36bfbc5bd95baaf01a670374ce083820ee82423599cbb67860a885c957bbfca5aee9686e9fe8c0253d2b3193ab731693f6e8777bac623f9f717c673
|
|
7
|
+
data.tar.gz: c2c83eee466869212fde7735e50eebb796f6e48320e42a523080aa98ee63d2f02cf894839b9c2c1b338c4e1019ccdf03abd9b4e928322c9226f98899591b0b98
|
|
@@ -59,10 +59,9 @@ module Resque
|
|
|
59
59
|
#Instance queue grouping
|
|
60
60
|
if !grouped_queues.keys.include?(nil) && grouped_queues.keys.size > 0
|
|
61
61
|
if ZuoraConnect.configuration.blpop_queue
|
|
62
|
-
@job_in_progress =
|
|
62
|
+
@job_in_progress = get_restricted_job
|
|
63
63
|
return @job_in_progress if @job_in_progress.present?
|
|
64
|
-
|
|
65
|
-
return @job_in_progress = get_restricted_job
|
|
64
|
+
return @job_in_progress = get_queued_job(grouped_queues)
|
|
66
65
|
else
|
|
67
66
|
@n ||= 0
|
|
68
67
|
@n += 1
|
|
@@ -106,7 +105,7 @@ module Resque
|
|
|
106
105
|
end
|
|
107
106
|
|
|
108
107
|
grouped_queues = grouped_queues.values.rotate(@n).map{|queue_list| get_categorized_queues(queue_list).to_h.values.flatten}.flatten.delete_if{|queue| !should_work_on_queue?(queue)}.map{|queue| "queue:#{queue}"}
|
|
109
|
-
queue, payload = Resque.redis.blpop(grouped_queues)
|
|
108
|
+
queue, payload = Resque.redis.blpop(grouped_queues, :timeout => ZuoraConnect.configuration.blpop_timeout)
|
|
110
109
|
queue = queue.split("queue:")[1]
|
|
111
110
|
@n = queue_index[queue] + 1
|
|
112
111
|
return create_job(queue, Resque.decode(payload))
|
|
@@ -3,7 +3,7 @@ module ZuoraConnect
|
|
|
3
3
|
|
|
4
4
|
attr_accessor :default_locale, :default_time_zone, :url, :mode, :delayed_job,:private_key, :additional_apartment_models
|
|
5
5
|
|
|
6
|
-
attr_accessor :enable_metrics, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block, :silencer_resque_finish, :blpop_queue
|
|
6
|
+
attr_accessor :enable_metrics, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block, :silencer_resque_finish, :blpop_queue, :blpop_timeout
|
|
7
7
|
|
|
8
8
|
attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri
|
|
9
9
|
|
|
@@ -19,6 +19,7 @@ module ZuoraConnect
|
|
|
19
19
|
@additional_apartment_models = []
|
|
20
20
|
@silencer_resque_finish = true
|
|
21
21
|
@blpop_queue = false
|
|
22
|
+
@blpop_timeout = ENV["BLPOP_TIMEOUT"] || 30
|
|
22
23
|
|
|
23
24
|
# Setting the app name for telegraf write
|
|
24
25
|
@enable_metrics = false
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: zuora_connect
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.7.
|
|
4
|
+
version: 1.7.56
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Connect Team
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-01-
|
|
11
|
+
date: 2019-01-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: apartment
|