lusnoc 1.0.1.81647 → 1.0.1.81655

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50b154f750c90199db9d2fdf86287bbc5baf66a81487ae159ad967acf46648ed
-  data.tar.gz: f26b45a43f07cb5b74b65a2668e57604d400d76725b4e9ad6dbf65ed3bb3203c
+  metadata.gz: 9d8b6fb803c649e27c50cc60efa54a883457c5b5a326e06a2710d4b33c35624a
+  data.tar.gz: 88432501ac7df9c532d8ea95c9425aa7b3aa381ebddf9092a67fd207af6c91e6
 SHA512:
-  metadata.gz: 277c9b797899a742a635f4ab8fc58bbf0d92992d5f9e9019f32dd29469cf30abcc933880da135e5ce1f7d44a6607e33813d07642db27ff14d59506562a469d3b
-  data.tar.gz: 0fb138ae084b8639ff087427bea5e97540a94bcd1ee870a92d3e35b37bdbd3e54583849dd60705bfc5d4b06141c16c22cc78dd3efebb30075cf9775b65414db1
+  metadata.gz: c4deed444ac90080936f49962c954d4f81799523ea2d054e247a835b57b85204a7150a6e7040034fc85b6fa0feba69eedf01aeeb1b55e75a85b2a902a87857de
+  data.tar.gz: 1dd863908e52441edfc91c62e86ba8abcefad15d22f445889057a2ce3cf9386d8d42557d9839c1966f25dce2d48597f214bf20effb11dea027e69266ff8898fc

data/lib/lusnoc/configuration.rb

@@ -4,7 +4,7 @@ module Lusnoc
   # Methods for configuring Lusnoc
   class Configuration
 
-    attr_accessor :url, :acl_token, :logger
+    attr_accessor :url, :acl_token, :logger, :http_timeout
 
     # Override defaults for configuration
     # @param url [String] consul's connection URL
@@ -13,6 +13,7 @@ module Lusnoc
       @url = url
       @acl_token = acl_token
       @logger = Logger.new(STDOUT, level: Logger::INFO, progname: 'Lusnoc')
+      @http_timeout = 5
     end
 
   end

data/lib/lusnoc.rb

@@ -24,7 +24,7 @@ module Lusnoc
       yield(configuration)
     end
 
-    def http_get(url, timeout: 5)
+    def http_get(url, timeout: Lusnoc.configuration.http_timeout)
       uri = URI(url)
 
       with_http(uri, timeout: timeout) do |http|
@@ -36,7 +36,7 @@ module Lusnoc
       end
     end
 
-    def http_put(url, value = nil, timeout: 5)
+    def http_put(url, value = nil, timeout: Lusnoc.configuration.http_timeout)
       uri = URI(url)
       data = value.is_a?(String) ? value : JSON.generate(value) unless value.nil?
 
@@ -55,14 +55,33 @@ module Lusnoc
     private
 
       def with_http(uri, timeout:)
-        Net::HTTP.start(uri.host, uri.port,
-                        use_ssl:          uri.scheme == 'https',
-                        read_timeout:     timeout,
-                        open_timeout:     1,
-                        continue_timeout: 1,
-                        write_timeout:    1,
-                        max_retries:      0) do |http|
-          yield(http)
+        with_retry(delay: 0.1) do
+          Net::HTTP.start(uri.host, uri.port,
+                          use_ssl:          uri.scheme == 'https',
+                          read_timeout:     timeout,
+                          open_timeout:     timeout,
+                          continue_timeout: timeout,
+                          write_timeout:    timeout,
+                          max_retries:      1) do |http|
+            yield(http)
+          end
+        end
+      end
+
+      def with_retry(count = 2, delay: 1, klass: nil)
+        begin
+          retries ||= 0
+          yield(retries)
+        rescue StandardError => e
+          sleep(delay + (retries**2) * delay)
+          if (retries += 1) < count
+            retry
+          else
+            raise if klass.nil?
+            return nil if klass == :skip
+
+            raise klass.new(e.message)
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lusnoc
 version: !ruby/object:Gem::Version
-  version: 1.0.1.81647
+  version: 1.0.1.81655
 platform: ruby
 authors:
 - Samoilenko Yuri