aggkit 0.4.9.19910 → 0.4.91.19914

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b657b5dea23eb5fbff2e12ee3b2cc60b6b38fd08c8dacd0228617f686e43ed32
-  data.tar.gz: 372f667ba11d9eca4a6f99384d740a8d873e5d2b9a50929387dffe803a1f599d
+  metadata.gz: '0911be0b1d65fa6d2377a38b5f63268246242bc84f2d7ffe7612df5f695fea68'
+  data.tar.gz: 2e913e29c41d8c50076fcc801f25b81357175a7bca9af03fe52f45edace37035
 SHA512:
-  metadata.gz: 445208a0a5b4f92701cbca89ce00d34be699abf292fe76242ec4039297d73841585c9eb4085d91c943af501a61e52f00f5758eb3b23e69beb3586e11f59f4a1e
-  data.tar.gz: b1489233760caea865521f3af563a5201461cf5b6c67fa164ddd6f77bd04589f6d43a21758b49215d686c74d5329a8f78ef646d10986d33a84b2d56d8f4bc8ee
+  metadata.gz: 2be8badd002d97de3b5f44e4a3a393e3442a2260c250421bfcbcfc47b5416e4bc824afc7e19df2c94207c3d8a167911f24c3256bd422685532c06cec97fd0f6b
+  data.tar.gz: 966330975a4f84dd82009bc5e459454b06bdf184317afbcf906eaf21c74061c05fc334c516ccaec3786fcce2ec0a9da20d83c02a1f8b2fdbcfdbc4d6d380333a

data/Gemfile.lock

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

data/bin/aggwrap

@@ -17,14 +17,9 @@ include Aggkit::Runner
 
 consul_addr = Aggkit::Consul.build_consul_addr(addr: ENV['CONSUL_HTTP_ADDR'], host: ENV['CONSUL_HOST'], port: ENV['CONSUL_PORT'])
 
-service = if ENV['AGGREDATOR_COMPONENT'].to_s == ''
-  ENV['AGGREDATOR_SERVICE']
-else
-  "#{ENV['AGGREDATOR_SERVICE']}-#{ENV['AGGREDATOR_COMPONENT']}"
-end
-
 @opts = {
-  service:         service,
+  service:         ENV['AGGREDATOR_SERVICE'],
+  component:       ENV.fetch("AGGREDATOR_COMPONENT", 'service').strip, 
   id:              Socket.gethostname,
   reload_interval: DEFAULT_RELOAD_INTERVAL,
   tags:            []
@@ -44,7 +39,7 @@ end
 parser = Aggkit::OptionParser.new do |o|
   o.banner = "Usage: #{UTIL} [options] -- exec script"
 
-  o.on('--service <NAME>', 'Set service NAME. $AGGREDATOR_SERVICE-$AGGREDATOR_COMPONENT env used when missed') do |service|
+  o.on('--service <NAME>', 'Set service NAME. AGGREDATOR_SERVICE env used when missed') do |service|
     @opts[:service] = service.to_s
   end
 
@@ -108,7 +103,8 @@ die 'service name must be provided' if @opts[:service].to_s.empty?
 
 die 'script must be provided' if @opts[:exec].empty?
 
-@opts[:tags] << "service-#{@opts[:service]}"
+@opts[:tags] += [@opts[:service], @opts[:component]]
+@opts[:tags] = @opts[:tags].flatten.compact.sort.uniq
 
 Diplomat.configure do |config|
   config.url = @opts[:consul]
@@ -120,9 +116,13 @@ SERVICE_ID = "#{@opts[:service]}_#{@opts[:id]}".freeze
   Name:   @opts[:service],
   ID:     SERVICE_ID,
   Checks: [],
-  Tags:   @opts[:tags]
+  Tags:   @opts[:tags],
+  Meta: {
+    component: @opts[:component]
+  }
 }
 
+
 @checks = {}
 
 

data/lib/aggkit/version.rb

@@ -1,6 +1,6 @@
 module Aggkit
 
-  VERSION = '0.4.9'.freeze
+  VERSION = '0.4.91'.freeze
 
 end
 

metadata

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