consul-client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80c1c93480e61e527b232543f56a88de8ffa42f9
-  data.tar.gz: abd798f99d22c71b7b382c076dd49d34ad1ecf7e
+  metadata.gz: 2e6ef0af86e0e5beeb6d9e18927c6a9ca8dfd9f7
+  data.tar.gz: 74d5718e0bddd2d18a4db0897eb22c6db92790d5
 SHA512:
-  metadata.gz: 57384907747b902ffb6638288097d6d020f3132e3c6698bb3ab83cc3694488688c282af15f6c233a3e07f5ce8a333191c660b3021c85537baecb69bffc7078df
-  data.tar.gz: da619c7990bd303b3e46af46c9a5bfb7eb02511315bc6300d6dc9248d67991d4d2bc123a021feca54fa5255d617341143fa8ac4b7dee0fabdfb4bc47019adf22
+  metadata.gz: 60032387daf1ec10aa55e1e968075daa651caf230bf4507097a47bd5bb12f97d1f14bfd221ce51c9148cef62714817c49ce2657cc97c7d12853c4251899e90ea
+  data.tar.gz: 44f794044862c1112c954c22b8d25704ac714cbae00f732b3e1747ad73993074e07023787d6f87c867b2b55b6e7c7f5716975d9b95ef81151b5e5e4fb00eda4c

data/consul-client.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |gem|
   gem.name          = "consul-client"
   gem.require_paths = ["lib"]
   gem.license       = "Apache 2.0"
-  gem.version       = '0.1.1'
+  gem.version       = '0.1.2'
   gem.has_rdoc      = false
 end

data/lib/consul/client.rb

@@ -31,7 +31,7 @@ module Consul
       # @example
       #     local = Consul::Client.v1.local_service('web')
       #     local.coordinated_shutdown! { $healthy = false }
-      def local_service(name, http: http, logger: http.logger)
+      def local_service(name, http:Consul::Client.v1.http(), logger:http.logger)
         LocalService.new(name, http: http, logger: logger)
       end
 

data/lib/consul/client/http.rb

@@ -56,7 +56,7 @@ module Consul
         check = ->{
           uri = URI.parse(url)
           uri.query ||= ""
-          uri.query += "&index=#{index}&wait=10s"
+          uri.query += "&index=#{index}&wait=60s"
           logger.debug("GET #{uri}")
 
           response = http_request(:get, uri)

data/lib/consul/client/local_service.rb

@@ -9,8 +9,8 @@ module Consul
       # @api private
       def initialize(name, http:, logger:)
         @name   = name
-        @consul = consul
-        consul.logger = logger
+        @consul = http
+        @consul.logger = logger
       end
 
       # Coordinate the shutdown of this node with the rest of the cluster so

data/lib/consul/client/service.rb

@@ -6,7 +6,7 @@ module Consul
     # @see Consul::Client::V1#service
     class Service
       # @api private
-      def initialize(name, consul: Consul::Client.v1)
+      def initialize(name, consul: Consul::Client.v1.http)
         @name   = name
         @consul = consul
       end
@@ -20,10 +20,10 @@ module Consul
       #           so make sure it does not conflict with other names. For
       #           instance, the leader lock for the +web+ service would be
       #           stored at +/kv/web/leader+.
-      def lock(key, &block)
+      def lock(key, checks: ["service:#{name}"], &block)
         session = consul.put("/session/create",
           LockDelay: '3s',
-          Checks:    ["service:#{name}", "serfHealth"]
+          Checks:    ["serfHealth"] + checks
         )["ID"]
         loop do
           locked = consul.put("/kv/#{name}/#{key}?acquire=#{session}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Xavier Shay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies: []
 description: Ruby client library for Consul HTTP API.
 email:
@@ -43,7 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby client library for Consul HTTP API, providing both a thin wrapper around