aggkit 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37fe2901158e5309db8e3eb0e3376e7b606c0c3c2c88c69d9985788f1168b5de
-  data.tar.gz: 771afcf919ab0c727dc0ce928894d6ac2f2df54eb583a7e0aef815f18f726b9e
+  metadata.gz: c156f847b57ffb06d37850c4119c7503da301329100855a826db70827aad4d48
+  data.tar.gz: 91bc2e8238ae3075be4cf2dd095ac2369a7cf0d917903c149fda4f38c4ed8074
 SHA512:
-  metadata.gz: 438119fb45e3ac6f8b0581b6440157966e29e3a28fcae73079c426cc97bd138fd4962fe85c4cca5f579323a377a5b69e59e9ab57220e9edb3c6a60202c9178b8
-  data.tar.gz: fbf311f0ff57bb254f563ea6ef89dfde4ef8a6aa7bc12e1a7ebe9f46f06683f48fab3d9679b00cdd9acf6e39562c615486047142fdea82eac9517eb351857c3b
+  metadata.gz: d875af24df50d76c408d15bf827f3173fb506d2e4fb1e6d932f8d220c1fda159b2a70e087a38809ce1febb57a5582205bd46879596d643b4c28456fc7bf7be84
+  data.tar.gz: 8970df7a2b695a6b8eb45e6a672e69d6e45e498ae15c83bf3a6b8e8eaafc78c756af6014acf0d0689d5f13e2ca64ebbcc51841fb79448de6e0ce46ae2c858012

data/bin/aggstart

@@ -4,9 +4,13 @@ require 'aggkit'
 
 UTIL = File.basename(__FILE__)
 
+if ENV['CONSUL_HTTP_ADDR'].to_s.empty?
+  ENV['CONSUL_HTTP_ADDR'] = "http://#{ENV['CONSUL_HOST'] || 'localhost'}:8500"
+end
+
 @opts = {
   service:    ENV['AGGREDATOR_SERVICE'],
-  consul:     ENV['CONSUL_HTTP_ADDR'] || ENV['CONSUL_HOST'] || 'localhost',
+  consul:     ENV['CONSUL_HTTP_ADDR'],
   consulconf: [],
   depends:    []
 }
@@ -26,8 +30,14 @@ parser = Aggkit::OptionParser.new do |o|
     @opts[:service] = service.to_s
   end
 
-  o.on("--consul=#{@opts[:consul]}", 'Set consul host. CONSUL_HOST env can be used instead') do |consul|
-    @opts[:consul] = consul.to_s
+  o.on("--consul=#{@opts[:consul]}", 'Set consul http address. CONSUL_HTTP_ADDR env can be used instead') do |consul|
+    if consul.to_s['http']
+      ENV['CONSUL_HTTP_ADDR'] = consul.to_s
+    else
+      ENV['CONSUL_HTTP_ADDR'] = "http://#{consul.to_s}:8500"
+    end
+    
+    @opts[:consul] = ENV['CONSUL_HTTP_ADDR']
   end
 
   o.on('--consulconf=consul,consul/smev3...', 'Set list of folders with consul configs. Special: none - disable local consul') do |list|
@@ -54,7 +64,6 @@ die 'exec script must be provided' if @opts[:exec].empty?
 @opts[:node_name] = "#{@opts[:service]}_#{`hostname`.strip}".strip
 
 ENV['AGGREDATOR_SERVICE'] = @opts[:service]
-ENV['CONSUL_HOST'] = @opts[:consul]
 ENV['NODE_NAME'] = @opts[:node_name]
 
 init_service @opts[:service], @opts
@@ -75,12 +84,12 @@ Aggkit::Watcher.new.exec do |watcher|
   end
 
 
-  execute!("aggwait -t 20 --consul-addr=http://#{@opts[:consul]}:8500 --consul", 'Timeout for consul service')
+  execute!("aggwait -t 20 --consul-addr=#{@opts[:consul]} --consul", 'Timeout for consul service')
 
   load_envs_from_consul(@opts[:consul], @opts[:service])
 
   @opts[:depends].each do |service|
-    execute!("aggwait -t 60 --consul-addr=http://#{@opts[:consul]}:8500 --consul-service #{service}", "Timeout for #{service} service")
+    execute!("aggwait -t 60 --consul-addr=#{@opts[:consul]} --consul-service #{service}", "Timeout for #{service} service")
   end
 
   sleep 2

data/lib/aggkit/version.rb

@@ -1,6 +1,6 @@
 module Aggkit
 
-  VERSION = '0.3.5'.freeze
+  VERSION = '0.3.6'.freeze
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Godko Ivan