aggkit 0.4.6.14358 → 0.4.6.15735

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa292be9e75ce9ff806c256b0402f5a50d25fd7354e8a7ebcfdba7d77e971733
-  data.tar.gz: 7757998c510f02bd1f57c51fbf90f7c46fdbce1008ed671e98488734370668df
+  metadata.gz: ebad3e35bc1a22ff1edbafffa65997b48acd9dcaad0be0b39bed671de48ffc0d
+  data.tar.gz: 2eb0459988a4ebc218af91abee41e5c1a9bf47be9168d0c735805e2f17eb1582
 SHA512:
-  metadata.gz: 61dffd250dad9125d11b27af7c822eac2d34dd7e7146cb824318fdfec75ca24f6ac88f25d855ee30e98e48cf6701151b3fb27f517d677456d588e535171ef546
-  data.tar.gz: c659e5114077650786eccb3d297bcefecb8a11160c8e5e463b8e8b6c38423c5e175346a5e34e3d0b318f441e583a9fad1259b9a814ffad3cc1ecd64587629944
+  metadata.gz: 2f69a33558cf182c5fde161103c5adb2ed0c92db43ff57113448087febb2349d5f4b1f375c86afa16948808f83ba0d08e83eaaf8985858dd7b5618dbfddd5a8d
+  data.tar.gz: e410f56200b71ff085aaa0a96cc84536c5abdfa5bb9ca28bc786df5caea44e3fbddfd69545465dd4ee941340b930265c27e414b3934c6e0ef896adcc3045b966

data/Gemfile.lock

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

data/bin/aggwrap

@@ -5,6 +5,7 @@ require 'securerandom'
 require 'aggkit'
 require 'net/http'
 require 'uri'
+require 'socket'
 
 module Diplomat
 
@@ -67,7 +68,7 @@ consul_addr = Aggkit::Consul.build_consul_addr(addr: ENV['CONSUL_HTTP_ADDR'], ho
 
 @opts = {
   service:         ENV['AGGREDATOR_SERVICE'],
-  id:              "#{Time.now.utc.strftime('%FT%T%z')}_#{SecureRandom.hex(2)}",
+  id:              Socket.gethostname,
   reload_interval: DEFAULT_RELOAD_INTERVAL,
   tags:            []
 }
@@ -171,7 +172,9 @@ SERVICE_ID = "#{@opts[:service]}_#{@opts[:id]}".freeze
 @checks[:exec] = "#{SERVICE_ID}_exec_ttl"
 @service[:Checks].push(
   CheckID:                        @checks[:exec],
+  ServiceID:                      SERVICE_ID,
   Name:                           "Wrapped service: #{@opts[:service]}. Process: #{@opts[:exec].inspect}",
+  Notes:                          "Wrapped service: #{@opts[:service]}. Process: #{@opts[:exec].inspect}",
   DeregisterCriticalServiceAfter: '1m',
   TTL:                            '50s'
 )
@@ -180,7 +183,9 @@ if @opts[:http]
   @checks[:http] = "#{SERVICE_ID}_http_ttl"
   @service[:Checks].push(
     CheckID:                        @checks[:http],
+    ServiceID:                      SERVICE_ID,
     Name:                           "Wrapped service: #{@opts[:service]}. HTTP: #{@opts[:http]}",
+    Notes:                          "Wrapped service: #{@opts[:service]}. HTTP: #{@opts[:http]}",
     DeregisterCriticalServiceAfter: '1m',
     TTL:                            '50s'
   )
@@ -190,7 +195,9 @@ if @opts[:file]
   @checks[:file] = "#{SERVICE_ID}_file_ttl"
   @service[:Checks].push(
     CheckID:                        @checks[:file],
+    ServiceID:                      SERVICE_ID,
     Name:                           "Wrapped service: #{@opts[:service]}. File: #{@opts[:file]}",
+    Notes:                          "Wrapped service: #{@opts[:service]}. File: #{@opts[:file]}",
     DeregisterCriticalServiceAfter: '1m',
     TTL:                            '50s'
   )
@@ -200,7 +207,9 @@ if @opts[:pidfile]
   @checks[:pidfile] = "#{SERVICE_ID}_pidfile_ttl"
   @service[:Checks].push(
     CheckID:                        @checks[:pidfile],
+    ServiceID:                      SERVICE_ID,
     Name:                           "Wrapped service: #{@opts[:service]}. Pidfile: #{@opts[:pidfile]}",
+    Notes:                          "Wrapped service: #{@opts[:service]}. Pidfile: #{@opts[:pidfile]}",
     DeregisterCriticalServiceAfter: '1m',
     TTL:                            '50s'
   )
@@ -210,14 +219,16 @@ if @opts[:script]
   @checks[:script] = "#{SERVICE_ID}_script_ttl"
   @service[:Checks].push(
     CheckID:                        @checks[:script],
+    ServiceID:                      SERVICE_ID,
     Name:                           "Wrapped service: #{@opts[:service]}. Script: #{@opts[:script]}",
+    Notes:                          "Wrapped service: #{@opts[:service]}. Script: #{@opts[:script]}",
     DeregisterCriticalServiceAfter: '1m',
     TTL:                            '50s'
   )
 end
 
 def make_ttl_pass(check_id, output = nil)
-  output = "#{Time.now.utc}\n#{output}"
+  output = "Check at: #{Time.now.utc}\n#{output}"
   STDERR.puts "TTL call failed: #{check_id}" unless Diplomat::Check.pass(check_id, output)
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.4.6.14358
+  version: 0.4.6.15735
 platform: ruby
 authors:
 - Godko Ivan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat