aggkit 0.4.5.12301 → 0.4.5.12324

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26fa6bda6378df5c2c899118bb2fd76f9ff438f7
-  data.tar.gz: 82693d68d13a5c23d975d07f8447081bce11cb5a
+  metadata.gz: 07ad58f9763727362844598bc0abc30902482bf7
+  data.tar.gz: 416a0f844d1670c7f1c2784fba6c363fa24805bf
 SHA512:
-  metadata.gz: df631a0eb56307cdc0d1bdc9e2c040764d6e66ed2327c5bf348f4d076e55ea599bc0f9fc4e0b8e145a365a35c49ddb708bd262b62ae3f223b4ac97780c53955d
-  data.tar.gz: ab2220b1f2cd779dad19b32117bd1617ac62af8bf1925dbe28cb684f9bce8cad61fb8d97e3c1b4350f6037304304b2f39201612a23fa8c150416967268514c2f
+  metadata.gz: 8bf4bff4e30bfe1d9191e771e90b0f4b2cc776c093d54f8c83503eec42b942f1df8916712c0f896818190f825053dfba43c283f2f04fa7aafec9f9fbb75e3f98
+  data.tar.gz: 98c75882b30b5b740d7f1e578ee2bc5120d61be8367f3d17b243daa40bf946dfe43f3fa4e07931e772bc92968f12f4f2df0e22d45e9f748c37a92e9d8b9cf5ab

data/bin/aggwrap

@@ -67,9 +67,9 @@ if ENV['CONSUL_HTTP_ADDR'].to_s.empty?
 end
 
 @opts = {
-  service: ENV['AGGREDATOR_SERVICE'],
-  id:      SecureRandom.hex(8),
-  consul:  ENV['CONSUL_HTTP_ADDR'],
+  service:         ENV['AGGREDATOR_SERVICE'],
+  id:              "#{Time.now.utc.strftime('%FT%T%z')}_#{SecureRandom.hex(2)}",
+  consul:          ENV['CONSUL_HTTP_ADDR'],
   reload_interval: DEFAULT_RELOAD_INTERVAL
 }
 
@@ -121,7 +121,6 @@ parser = Aggkit::OptionParser.new do |o|
   o.on('--reload-config-interval <INTERVAL>', 'Seconds between check change service configuration') do |interval|
     @opts[:reload_interval] = Integer(interval)
   end
-
 end
 parser.parse!
 
@@ -194,10 +193,12 @@ if @opts[:script]
 end
 
 def make_ttl_pass(check_id, output = nil)
+  output = "#{Time.now.utc}\n#{output}"
   STDERR.puts "TTL call failed: #{check_id}" unless Diplomat::Check.pass(check_id, output)
 end
 
 def make_ttl_fail(check_id, output = nil)
+  output = "#{Time.now.utc}\n#{output}"
   STDERR.puts "TTL call failed: #{check_id}" unless Diplomat::Check.fail(check_id, output)
 end
 
@@ -283,7 +284,7 @@ end
 
 
 Thread.new(@opts[:reload_interval], @opts[:service]) do |sleep_interval, service_name|
-  kv_prefix = ['services', 'env']
+  kv_prefix = %w[services env]
   config_hash = nil
   service_kv_path = kv_prefix.append(service_name).join('/')
   loop do
@@ -294,7 +295,7 @@ Thread.new(@opts[:reload_interval], @opts[:service]) do |sleep_interval, service
     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.")
+      die('Change kv configuration for consul service.')
     end
     config_hash = new_hash
   end

metadata

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