aggkit 0.4.91.20757 → 0.4.91.21460

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad59d74029e6730df38badc8965483a4e8ceb066b8c21fd32ddffeba996c43b7
-  data.tar.gz: 7049f07a13d9211b16ddcb01e9d9312c14d3545951a27818c2095150bde3fa7b
+  metadata.gz: 85bf25ce943e64b3c06008e05eeb9fbae99e9e57640d630c929f042126da0610
+  data.tar.gz: b5bbd577d16a586ebd768ebdc7ed0f6bbc5e99b218f0dcec5ac51fdb77d0e0df
 SHA512:
-  metadata.gz: 5f00c9ed24e1d1c73e70d32adc299083ca5f6ed5e0263cfe7c866d7c17cf83f039efe459afcb872aab1a21ece477ffdf9448c4badd0cb49834ecdb72a0c1cbcc
-  data.tar.gz: 83de32732528babf50aa74d078be0c03e16d543a3b83932df1c6fb4a490d488bfd86e13404026a1433738c28300e6de3cd40aef5e68a713ac21222ba5e7526ce
+  metadata.gz: 5cb6116f61a6f8828ba7f6eb3fe37289da61676bf89674955fe94b25a240c188430280be32199a4e3f8ba5a0609c9ef1093e8c77860cb9af5347c6aa9b15d174
+  data.tar.gz: 8e519d2aac6935545298fb17d2c565e6125161f90dbe8a19a9329e223ab062f9bc8ee22c8a3eacacc92dd7790e14faa62a11d349be2a90c916ca8e02d385ad1a

data/.rubocop.yml

@@ -93,7 +93,7 @@ Style/BracesAroundHashParameters:
 #  Enabled: false
 
 Layout/IndentationConsistency:
-  EnforcedStyle: rails
+  EnforcedStyle: indented_internal_methods
   
 Layout/EmptyLines:
   Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aggkit (0.4.91.20757)
+    aggkit (0.4.91.21460)
       diplomat
       dotenv
       json

data/bin/aggwait

@@ -178,13 +178,12 @@ def wait_for_consul_service(tag_with_service)
     tag = nil
   end
 
-  tag ||= @opts[:consul_tag]
+  tags = "#{tag}+#{@opts[:consul_tag]}".to_s.split('+').map(&:to_s).reject(&:empty?).uniq
 
-  log("Waiting for consul service #{service}#{tag ? " with tag #{tag}" : ''}...")
+  log("Waiting for consul service #{service}#{tags.empty? ? '' : " with tag #{tags}"}...")
   ret = wait_for @opts[:timeout] do
-    tag_query = tag ? "&tag=#{tag}" : ''
+    tag_query = tags.empty? ? '' : tags.reduce(''){|q, t| q + "&tag=#{t}"}
     cmd = "curl -s \"#{@opts[:consul_addr]}/v1/health/service/#{service}?passing#{tag_query}\""
-
     result = `#{cmd}`
     result = begin
                JSON.parse(result)

data/bin/aggwrap

@@ -19,7 +19,7 @@ consul_addr = Aggkit::Consul.build_consul_addr(addr: ENV['CONSUL_HTTP_ADDR'], ho
 
 @opts = {
   service:         ENV['AGGREDATOR_SERVICE'],
-  component:       ENV.fetch("AGGREDATOR_COMPONENT", 'service').strip, 
+  component:       ENV.fetch('AGGREDATOR_COMPONENT', 'service').strip,
   id:              Socket.gethostname,
   reload_interval: DEFAULT_RELOAD_INTERVAL,
   tags:            []
@@ -117,7 +117,7 @@ SERVICE_ID = "#{@opts[:service]}_#{@opts[:component]}_#{@opts[:id]}".freeze
   ID:     SERVICE_ID,
   Checks: [],
   Tags:   @opts[:tags],
-  Meta: {
+  Meta:   {
     component: @opts[:component]
   }
 }
@@ -132,8 +132,8 @@ SERVICE_ID = "#{@opts[:service]}_#{@opts[:component]}_#{@opts[:id]}".freeze
   ServiceID:                      SERVICE_ID,
   Name:                           "Wrapped service: #{@opts[:service]}. Process: #{@opts[:exec].inspect}",
   Notes:                          "Service: #{SERVICE_ID} Check: #{@checks[:exec]}",
-  DeregisterCriticalServiceAfter: '1m',
-  TTL:                            '50s'
+  DeregisterCriticalServiceAfter: '10m',
+  TTL:                            '100s'
 )
 
 if @opts[:http]
@@ -143,8 +143,8 @@ if @opts[:http]
     ServiceID:                      SERVICE_ID,
     Name:                           "Wrapped service: #{@opts[:service]}. HTTP: #{@opts[:http]}",
     Notes:                          "Service: #{SERVICE_ID} Check: #{@checks[:http]}",
-    DeregisterCriticalServiceAfter: '1m',
-    TTL:                            '50s'
+    DeregisterCriticalServiceAfter: '10m',
+    TTL:                            '100s'
   )
 end
 
@@ -155,8 +155,8 @@ if @opts[:file]
     ServiceID:                      SERVICE_ID,
     Name:                           "Wrapped service: #{@opts[:service]}. File: #{@opts[:file]}",
     Notes:                          "Service: #{SERVICE_ID} Check: #{@checks[:file]}",
-    DeregisterCriticalServiceAfter: '1m',
-    TTL:                            '50s'
+    DeregisterCriticalServiceAfter: '10m',
+    TTL:                            '100s'
   )
 end
 
@@ -167,8 +167,8 @@ if @opts[:pidfile]
     ServiceID:                      SERVICE_ID,
     Name:                           "Wrapped service: #{@opts[:service]}. Pidfile: #{@opts[:pidfile]}",
     Notes:                          "Service: #{SERVICE_ID} Check: #{@checks[:pidfile]}",
-    DeregisterCriticalServiceAfter: '1m',
-    TTL:                            '50s'
+    DeregisterCriticalServiceAfter: '10m',
+    TTL:                            '100s'
   )
 end
 
@@ -179,19 +179,19 @@ if @opts[:script]
     ServiceID:                      SERVICE_ID,
     Name:                           "Wrapped service: #{@opts[:service]}. Script: #{@opts[:script]}",
     Notes:                          "Service: #{SERVICE_ID} Check: #{@checks[:script]}",
-    DeregisterCriticalServiceAfter: '1m',
-    TTL:                            '50s'
+    DeregisterCriticalServiceAfter: '10m',
+    TTL:                            '100s'
   )
 end
 
 def make_ttl_pass(check_id, output = nil)
   output = "Check at: #{Time.now.utc}\n#{output}"
-  STDERR.puts "TTL call failed: #{check_id}" unless Diplomat::Check.pass(check_id, output, timeout: 5)
+  warn "TTL call failed: #{check_id}" unless Diplomat::Check.pass(check_id, output, timeout: 5)
 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, timeout: 5)
+  warn "TTL call failed: #{check_id}" unless Diplomat::Check.fail(check_id, output, timeout: 5)
 end
 
 def check_http(check_id, port)
@@ -235,7 +235,7 @@ end
 def run_check(check_id)
   yield(check_id)
 rescue StandardError => e
-  STDERR.puts "make_ttl_pass[#{check_id}] Exception: #{e.inspect}"
+  warn "make_ttl_pass[#{check_id}] Exception: #{e.inspect}"
 end
 
 Thread.abort_on_exception = true
@@ -246,7 +246,7 @@ def with_retry(count = 2)
     yield(retries + 1)
   rescue StandardError
     if (retries += 1) < count
-      STDERR.puts "Retry #{retries} at: #{Time.now}..."
+      warn "Retry #{retries} at: #{Time.now}..."
       retry
     else
       raise
@@ -254,74 +254,81 @@ def with_retry(count = 2)
   end
 end
 
-def ensure_service_registered
-  with_retry(3) do |r|
-    timeout = 10 + 5 * r
+def ensure_service_registered(retries = 2)
+  with_retry(retries) do |_r|
+    timeout = 30
     unless Diplomat::Service.register(@service, timeout: timeout)
-      raise "Registration failed by Diplomat. Service:#{@service[:Name]} ID:#{@service[:ID]} (retry #{r})" 
+      raise "Registration failed by Diplomat. Service:#{@service[:Name]} ID:#{@service[:ID]} (retry #{r})"
     end
+
     yield
   end
-rescue => e
+rescue StandardError => e
   die("Can't register service #{@service} in consul: #{e}")
 end
 
-Thread.new do
-  loop do
-    ensure_service_registered do
-      run_check(@checks[:exec]) do |check_id|
-        make_ttl_pass(check_id)
-      end
-
-      if @checks[:http]
-        run_check(@checks[:http]) do |check_id|
-          check_http(check_id, @opts[:http])
-        end
-      end
-
-      if @checks[:file]
-        run_check(@checks[:file]) do |check_id|
-          check_file(check_id, @opts[:file])
-        end
-      end
-
-      if @checks[:pidfile]
-        run_check(@checks[:pidfile]) do |check_id|
-          check_pidfile(check_id, @opts[:pidfile])
-        end
-      end
+def run_all_checks(checks, options)
+  checks.each do |(type, check_id)|
+    opts = options[type]
 
-      if @checks[:script]
-        run_check(@checks[:script]) do |check_id|
-          check_script(check_id, @opts[:script])
-        end
-      end
+    case type
+    when :exec    then run_check(check_id) { make_ttl_pass(check_id) }
+    when :http    then run_check(check_id) { check_http(check_id, opts) }
+    when :file    then run_check(check_id) { check_file(check_id, opts) }
+    when :pidfile then run_check(check_id) { check_pidfile(check_id, opts) }
+    when :script  then run_check(check_id) { check_script(check_id, opts) }
+    else
+      die("Invalid check type: #{type} with id: #{check_id}")
     end
 
-    sleep rand(10..29)
+    sleep rand(1..5)
   end
 end
 
+def start_ttl_thread
+  Thread.new do
+    sleep rand(5..15)
 
-Thread.new(@opts[:reload_interval], @opts[:service]) do |sleep_interval, service_name|
-  kv_prefix = %w[services env]
-  config_hash = nil
-  service_kv_path = kv_prefix.push(service_name).join('/')
-  loop do
-    sleep sleep_interval
-    data = Diplomat::Kv.get(service_kv_path, recurse: true, convert_to_hash: true) rescue {}
+    loop do
+      ensure_service_registered(50) do
+        run_all_checks(@checks, @opts)
+      end
 
-    service_data = data.dig(*kv_prefix)
-    next if service_data.nil?
+      sleep rand(30..59)
+    end
+  end
+end
 
-    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.')
+def start_config_reload_thread(pid)
+  Thread.new(@opts[:reload_interval], @opts[:service]) do |sleep_interval, service_name|
+    kv_prefix = %w[services env]
+    config_hash = nil
+    service_kv_path = kv_prefix.push(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
+        warn 'Change kv configuration for consul service.'
+        ::Process.kill(:TERM, pid)
+        sleep 15
+        ::Process.kill(:KILL, pid)
+        sleep 10
+        die('Something wrong: we must be killed')
+      end
+      config_hash = new_hash
     end
-    config_hash = new_hash
   end
 end
 
+ensure_service_registered(2) do |r|
+  STDOUT.puts "Registration success by Diplomat. Service:#{@service[:Name]} ID:#{@service[:ID]} (retry #{r})"
+  start_ttl_thread
+end
 
 $pid = fork do
   STDERR.sync
@@ -336,6 +343,8 @@ end
   end
 end
 
+start_config_reload_thread($pid)
+
 _pid, status = Process.wait2($pid)
 
 result = {}
@@ -358,7 +367,7 @@ if result[:signal]
 elsif result[:exit]
   exit(result[:exit])
 else
-  STDERR.puts 'unknown subprocess result'
+  warn 'unknown subprocess result'
   exit(-1)
 end
 

metadata

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