aggkit 0.4.8.19389 → 0.4.8.19621

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e05fab4034523d27a1f4f391ba270cc7ae32ab4b03f0ec3ef0bb5cda97aa9fb
-  data.tar.gz: 0dcadea42472126b0ae32c3a59a8f06bb03f02e13d9a5583b7f72efeb6e091de
+  metadata.gz: 62b21d86611dd16abace3fc55548ed8e0de34bd5bb68b3e2f4bbc10bbcb8b610
+  data.tar.gz: ac83f17317ab2b62ac0650574de2bda400e7caef97c4c5ccbac38ad40208be0b
 SHA512:
-  metadata.gz: 5f0b421bc88b03ba308478bcb254bedeca5e05dec63cfaac6b0c0639ebc02ec83bf65137270099ca7f01adc1ddc9c92b841cc833ec30a4943faa331246b13ef9
-  data.tar.gz: 23d995a369826fe9dcc05a94eb32eeb437cebc9597d2af176df15693dab6211bde50f5d98c17e5660355322846e75419172d6e8dd6974907a94fda855ecedb1f
+  metadata.gz: 9598e7efb861be2ac6883910d2bd1189b3d106be6102050d5a6c4fd65a18d49cf8fb14866d28c9aee9bf712002c11de3706defdaf42ca845722174a1b43f0c39
+  data.tar.gz: e9f5d35d0548fb1715c7f9ec70aa042db12463ff193407c3cfa94c4f3191d4ca80371744b15fa5436550c2ca94110546e27c699aeca0288949fd2a98ae61f044

data/Gemfile.lock

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

data/bin/aggwrap

@@ -234,38 +234,63 @@ end
 
 Thread.abort_on_exception = true
 
+def with_retry(count = 2)
+  begin
+    retries ||= 0
+    yield
+  rescue StandardError
+    if (retries += 1) < count
+      STDERR.puts "Retry #{retries}..."
+      retry
+    else
+      raise
+    end
+  end
+end
+
+def ensure_service_registered
+  with_retry(3) do
+    STDERR.puts "Ensure service #{@service} registered..."
+    raise "Registration failed by Diplomat" unless Diplomat::Service.register(@service, timeout: 10)
+    yield
+  end
+rescue => e
+  die("Can't register service #{@service} in consul: #{e}")
+end
+
 Thread.new do
   loop do
-    die("Can't register service #{@service} in consul") unless Diplomat::Service.register(@service, timeout: 10)
-    run_check(@checks[:exec]) do |check_id|
-      make_ttl_pass(check_id)
-    end
+    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])
+      if @checks[:http]
+        run_check(@checks[:http]) do |check_id|
+          check_http(check_id, @opts[:http])
+        end
       end
-    end
 
-    if @checks[:file]
-      run_check(@checks[:file]) do |check_id|
-        check_file(check_id, @opts[:file])
+      if @checks[:file]
+        run_check(@checks[:file]) do |check_id|
+          check_file(check_id, @opts[:file])
+        end
       end
-    end
 
-    if @checks[:pidfile]
-      run_check(@checks[:pidfile]) do |check_id|
-        check_pidfile(check_id, @opts[:pidfile])
+      if @checks[:pidfile]
+        run_check(@checks[:pidfile]) do |check_id|
+          check_pidfile(check_id, @opts[:pidfile])
+        end
       end
-    end
 
-    if @checks[:script]
-      run_check(@checks[:script]) do |check_id|
-        check_script(check_id, @opts[:script])
+      if @checks[:script]
+        run_check(@checks[:script]) do |check_id|
+          check_script(check_id, @opts[:script])
+        end
       end
     end
 
-    sleep rand(10..19)
+    sleep rand(10..29)
   end
 end
 

metadata

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