consul-rb 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f45fb6fb2d5e790880299ae76b1876051641576
-  data.tar.gz: fc64b3407dbd1d98fe3f7d8820043b51b02d0e07
+  metadata.gz: e7b13045741583002fe5d6c70b52c7f7fc27a790
+  data.tar.gz: db1009eb269cd1554925ec1da771d07852565be9
 SHA512:
-  metadata.gz: 4ff3db78b60040647d1ecf9a7bbae41719e1a0ecf0c1905932d4929238380309c0195c1950c82350ba5df70f5cce9e57c3e44ead8d0d5bef4cb2708f4a4daa29
-  data.tar.gz: 523ccd3fc1e27db878b966660f4c0dee2259195dc6f8bf5da130240fa71951873211ba013a59f442b10486882f00982866169305267a2cbc9d775971539e49da
+  metadata.gz: 72b3e35739ee2c8e03e0ee0d4a2e4ee76dcd3f6f070ca2685d90dcb145a65807a0c7b97d67e19ee1c42352b00ac5540d458b3c1b3d24a7fb276eb41243fd83f7
+  data.tar.gz: b34278fc18874e73710b31394efa4c43989001faebbb37293242873b01a6eb63f0b56f410887688a3bea315e8f35ad0d65f606bc8e07e35904545ab59c32a490

data/lib/consul/client/http.rb

@@ -12,10 +12,11 @@ module Consul
     InavlidArgument = Class.new(StandardError)
 
     class HTTP
-      def initialize(host:, port:, logger:)
+      def initialize(host:, port:, logger:, :rpc_retries_timeout)
         @host   = host
         @port   = port
         @logger = logger
+        @rpc_retries_timeout = rpc_retries_timeout
       end
 
       def get(request_uri, recurse: false, raw: false)
@@ -129,7 +130,10 @@ module Consul
         JSON.parse("[#{response.body}]")[0]
       end
 
-      def http_request(method, uri, data = nil, timeout = 60)
+      def http_request(method, uri, data = nil, timeout = 60, rpc_retries_timeout = nil)
+        start = Time.now
+        rpc_retries_timeout ||= @rpc_retries_timeout
+
         method = {
           get: Net::HTTP::Get,
           put: Net::HTTP::Put,
@@ -153,6 +157,13 @@ module Consul
           end
         rescue Net::ReadTimeout
           raise TimeoutException, "timeout on #{uri}"
+        rescue RpcErrorException
+          if Time.now - start > rpc_retries_timeout
+            raise RpcErrorException, "#{response.code} on #{uri} lasted for over #{rpc_retries_timeout} seconds"
+          else
+            sleep 1
+            retry
+          end
         end
 
         response

data/lib/consul/client.rb

@@ -8,8 +8,8 @@ module Consul
     end
 
     class V1
-      def http(host: "localhost", port: 8500, logger: Logger.new("/dev/null"))
-        HTTP.new(host: host, port: port, logger: logger)
+      def http(host: "localhost", port: 8500, logger: Logger.new("/dev/null"), rpc_retries_timeout: 10)
+        HTTP.new(host: host, port: port, logger: logger, rpc_retries_timeout: rpc_retries_timeout)
       end
     end
   end

data/lib/consul/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Client
-    VERSION ||= '0.0.8'
+    VERSION ||= '0.0.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Alexander Piavlo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -35,7 +35,6 @@ files:
 - consul-rb.gemspec
 - lib/consul/client.rb
 - lib/consul/client/http.rb
-- lib/consul/kv.rb
 - lib/consul/version.rb
 homepage: https://github.com/SupersonicAds/consul-rb
 licenses:

data/lib/consul/kv.rb

@@ -1,5 +0,0 @@
-module Consul
-	module KV
-		
-	end
-end