aggkit 0.4.0.9101 → 0.4.0.9107
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/bin/aggwait +14 -3
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8738f257fab1dc505137762ef9bd39443ae56a83
|
4
|
+
data.tar.gz: 4315e9cd08473e44945d69e2bd8b11ec103421cf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1790ae7a61b2d2932b644879c96d35fdc2f9fefd05f28093b1da30420f8ef2f69687edaf07a6fc73813416f37bce42ef81dbf830ace30c9525d694f699e6ef67
|
7
|
+
data.tar.gz: 2a40a3725bb183954d8b0f66b36f60a22053e0aff1fdcc3d5c89c65e715ebe0fb90720895038c3202aa695813efaa784682ca2ed3da33b574a485c50497a8535
|
data/Gemfile.lock
CHANGED
data/bin/aggwait
CHANGED
@@ -15,6 +15,10 @@ INTERVAL = 3
|
|
15
15
|
|
16
16
|
@opts = {}
|
17
17
|
|
18
|
+
if ENV['CONSUL_HTTP_ADDR'].to_s.empty?
|
19
|
+
ENV['CONSUL_HTTP_ADDR'] = "http://#{ENV['CONSUL_HOST'] || 'localhost'}:8500"
|
20
|
+
end
|
21
|
+
|
18
22
|
@opts[:exec] = (begin
|
19
23
|
ARGV.join(' ').split(' -- ')[1].strip
|
20
24
|
rescue StandardError
|
@@ -22,7 +26,7 @@ INTERVAL = 3
|
|
22
26
|
end)
|
23
27
|
@opts[:timeout] = TIMEOUT
|
24
28
|
@opts[:interval] = INTERVAL
|
25
|
-
@opts[:consul_addr] = '
|
29
|
+
@opts[:consul_addr] = ENV['CONSUL_HTTP_ADDR']
|
26
30
|
@opts[:consul_service_count] = 1
|
27
31
|
|
28
32
|
|
@@ -48,8 +52,15 @@ OptionParser.new do |o|
|
|
48
52
|
@opts[:file] = file.strip
|
49
53
|
end
|
50
54
|
|
51
|
-
o.on("--consul-addr addr=#{@opts[:consul_addr]}", 'HTTP addres to connect to consul') do |
|
52
|
-
|
55
|
+
o.on("--consul-addr addr=#{@opts[:consul_addr]}", 'HTTP addres to connect to consul') do |consul|
|
56
|
+
ENV['CONSUL_HTTP_ADDR'] = if consul.to_s['http']
|
57
|
+
consul.to_s
|
58
|
+
else
|
59
|
+
"http://#{consul}:8500"
|
60
|
+
end
|
61
|
+
|
62
|
+
@opts[:consul_addr] = ENV['CONSUL_HTTP_ADDR']
|
63
|
+
|
53
64
|
end
|
54
65
|
|
55
66
|
o.on('--consul', 'Wait for local consul agent to be ready') do
|