aggkit 0.4.4.10477 → 0.4.4.11050

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d76aef3ab0c4a688d36c112a6b9211bffa3c02d6
-  data.tar.gz: e0b28f0a9c673a661058887ef4c4c9fe37b93d21
+  metadata.gz: e382cdb9cfb986897ccc243f7c91f544c4834531
+  data.tar.gz: 1443f0a041c67d7c0adf82837a946a8b026d16fa
 SHA512:
-  metadata.gz: 1c4da6ab9b8b83a728ecbbd8c0b503772f00831cc2ed8f7c2851ea8c3b133ada6a2d9b7809f8a2f993d906b0eef3689a2bc564b2480e45ecae4140e12b01b8ef
-  data.tar.gz: 761e7c2e252507b1f294abf6b6e531262d7b989e9511bfeef809eafc5b20748302b7d422e83d291b894568c59c7b2191ea67d0b33025dcd54a6dc25340cc9e16
+  metadata.gz: d6e652bf997f8de37bbc90b4e40fe94dcaf31aeb2806d98783a79d3c1ecc8602377c530e0b36fc79a4a779202a0af0f0b406bf777163e34ed6a0809ff0d7859f
+  data.tar.gz: d672dbe8d83d3354f72918927ed3b155a01ea0f5830faf33ca89497833ad5373ffc6e62710fdd6c36a308d09657967998a481215c077752c6d7a40539b60052f

data/bin/aggwrap

@@ -57,6 +57,8 @@ STDERR.sync
 STDOUT.sync
 
 UTIL = File.basename(__FILE__)
+DEFAULT_RELOAD_INTERVAL = 60 # seconds
+
 
 include Aggkit::Runner
 
@@ -67,7 +69,8 @@ end
 @opts = {
   service: ENV['AGGREDATOR_SERVICE'],
   id:      SecureRandom.hex(8),
-  consul:  ENV['CONSUL_HTTP_ADDR']
+  consul:  ENV['CONSUL_HTTP_ADDR'],
+  reload_interval: DEFAULT_RELOAD_INTERVAL
 }
 
 @opts[:exec] = (begin
@@ -113,6 +116,12 @@ parser = Aggkit::OptionParser.new do |o|
   o.on('--script <FILE>', 'Create TTL consul check and pass script result to it') do |file|
     @opts[:script] = file.to_s
   end
+
+
+  o.on('--reload-config-interval <INTERVAL>', 'Seconds between check change service configuration') do |interval|
+    @opts[:reload_interval] = Integer(interval)
+  end
+
 end
 parser.parse!
 
@@ -272,6 +281,26 @@ Thread.new do
   end
 end
 
+
+Thread.new(@opts[:reload_interval], @opts[:service]) do |sleep_interval, service_name|
+  kv_prefix = ['services', 'env']
+  config_hash = nil
+  service_kv_path = kv_prefix.append(service_name).join('/')
+  loop do
+    sleep sleep_interval
+    data = Diplomat::Kv.get(service_kv_path, recurse: true, convert_to_hash: true) rescue {}
+
+    service_data = data.dig(*kv_prefix)
+    next if service_data.nil?
+    new_hash = Digest::MD5.new.update(service_data.to_json).hexdigest
+    if !config_hash.nil? && config_hash != new_hash
+      die("Change kv configuration for consul service.")
+    end
+    config_hash = new_hash
+  end
+end
+
+
 $pid = fork do
   STDERR.sync
   STDOUT.sync

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.4.4.10477
+  version: 0.4.4.11050
 platform: ruby
 authors:
 - Godko Ivan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat