aggkit 0.2.9.8711 → 0.2.9.8725
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +2 -2
- data/bin/aggstart +15 -8
- 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: d0aca73460b75c612192138b7fc158d09f100285
|
|
4
|
+
data.tar.gz: 71d6c9237c9b0a37f34475c14bcfa3668df72be9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 29fb6e8d0aa9a82707150ace023c69d915b9b1e6d7f23b5b7ee72fdd1bd086b8817bd5de13ce94f48d9f0e243437bdc5347149c72acd2c22ff289ee72747fc37
|
|
7
|
+
data.tar.gz: 524cf71c2d723310082bc9792d4a1f5d9a01fc3e0f7fd9b26cb56daa7abe14237d3299872c8cf91861002041c61967986966840cae4675851967ae3de3b5e73e
|
data/Gemfile.lock
CHANGED
data/bin/aggstart
CHANGED
|
@@ -21,7 +21,11 @@ parser = OptionParser.new do |o|
|
|
|
21
21
|
end
|
|
22
22
|
|
|
23
23
|
o.on("--consul=#{@opts[:consul]}", 'set consul host') do |consul|
|
|
24
|
-
|
|
24
|
+
if consul.to_s == 'none'
|
|
25
|
+
@opts[:consul] = nil
|
|
26
|
+
else
|
|
27
|
+
@opts[:consul] = consul.to_s
|
|
28
|
+
end
|
|
25
29
|
end
|
|
26
30
|
|
|
27
31
|
o.on("--consulconf=list", 'set list of folders with consul configs') do |list|
|
|
@@ -51,19 +55,22 @@ $NODE_NAME = ENV['NODE_NAME'] ||= "#{$AGGREDATOR_SERVICE}_#{`hostname`.strip}".s
|
|
|
51
55
|
envsubst '/home/app/consul'
|
|
52
56
|
|
|
53
57
|
Aggkit::Watcher.new.exec do |watcher|
|
|
54
|
-
#watcher.add %W{consul agent -config-dir consul -config-dir consul/smev3 -node #{$NODE_NAME}}
|
|
55
|
-
configs = @opts[:consulconf].map do |folder|
|
|
56
|
-
"-config-dir #{folder}"
|
|
57
|
-
end.join(' ').strip
|
|
58
58
|
|
|
59
|
-
|
|
59
|
+
if @opts[:consul]
|
|
60
|
+
#watcher.add %W{consul agent -config-dir consul -config-dir consul/smev3 -node #{$NODE_NAME}}
|
|
61
|
+
configs = @opts[:consulconf].map do |folder|
|
|
62
|
+
"-config-dir #{folder}"
|
|
63
|
+
end.join(' ').strip
|
|
60
64
|
|
|
61
|
-
|
|
65
|
+
watcher.add "consul agent #{configs} -node #{$NODE_NAME}".split
|
|
66
|
+
end
|
|
67
|
+
|
|
68
|
+
execute!("aggwait -t 20 --consul-addr=http://#{$CONSUL_HOST}:8500 --consul", "Timeout for consul service")
|
|
62
69
|
|
|
63
70
|
load_envs_from_consul($CONSUL_HOST, $AGGREDATOR_SERVICE)
|
|
64
71
|
|
|
65
72
|
@opts[:depends].each do |service|
|
|
66
|
-
execute!("
|
|
73
|
+
execute!("aggwait -t 60 --consul-addr=http://$CONSUL_HOST:8500 --consul-service #{service}", "Timeout for #{service} service")
|
|
67
74
|
end
|
|
68
75
|
|
|
69
76
|
sleep 2
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: aggkit
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.9.
|
|
4
|
+
version: 0.2.9.8725
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Godko Ivan
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2019-02-
|
|
12
|
+
date: 2019-02-19 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: diplomat
|