etcd-tools 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDEyMzBmODFkNmM1ZjA1ZDEyOGUxNzNiNzQ0OWU0OGQ3MGE4ZGEyNw==
+    ZjQ3OTQ5ZDg5MmM1MzgxY2E3MTE4YzhjNDI5NzRmZmZkMDQxMWUwYw==
   data.tar.gz: !binary |-
-    ODk5YzYxMWM4ZTE3ODUwMWFmMWIyMTRhNTg5YzE4ZDczNmRhZjY5ZA==
+    ZDNmZjQyMWE1NjcwOGYxMjNmMTBkMzcxMjU1OWIyODVlZWVkY2FhZA==
 SHA512:
   metadata.gz: !binary |-
-    NWM0ZDFjMGZlNDM0NmVlOTQ4ZmFjOTE3Y2Q2MDU2YWNhNTE4ZmVkMWY2MGUy
-    MWNhNDkwMzEwYzc4MjEyNzkyZTQ0MjkxYTMwMTBhOTI4MmY0OTNhMjQ4YjUx
-    OTY0Y2UxYTMwYzNiZjA0NWViZWQ5OTQ2MGQ1MmRiZmY3YWQ5MDc=
+    ZjFkOWRmZmFjYmQ3MDI1ZjVmY2NlZWQyOWY3NWI1NTU1MjY4M2E3ODYyOGY2
+    YTA4OTI5YmIxMTFiNjMxNGUzMWQyYjQ2ZmRkMThlMTI3YzlmYjljYjI4MmQ3
+    ODY1Y2UwYTc0YmNhZjNkODk4MTkyYmE0ODIyODkwNjBkN2QxODM=
   data.tar.gz: !binary |-
-    NDAzMWMwOGVmMDA4MmQ1ZjNhYjVmMjVmYzE2MzhjODM5YzU1Mjg5ZGUyYjQy
-    OTQ0M2U3ZmM2ZmI5MTMzNTdiNTQ1ZTg3MzZjNjhhOTVhN2FmOTI5MDcyZDE5
-    MTlhMTAxZmZlZTdkMjlmZDE4YTcwN2RmZDJmZTQ0NTNhNjdlOGY=
+    NmFmNzYwZDVhNjljNTViZTRiOGYxZGRhOTk5MjhlNDA1YzM5MmUyZWRlNmJm
+    YmU5NDgxZDM2MGUwNzc1MDFlY2RmYzc0NDhjZWY4ODFjYTIzZTRjYmZkOWMw
+    MTU1NjI1NjQ1Y2YxN2RiMTE0NWFiYzA5MTc5ODMyMDdiY2NmNDQ=

data/lib/etcd-tools/cli/etcd2yaml.rb

@@ -38,7 +38,7 @@ module EtcdTools
 
         begin
           @etcd = etcd_connect @options[:url]
-        rescue EtcdTools::ClusterConnectError
+        rescue Etcd::ClusterConnectError
           $stderr.puts "Failed to connect to ETCD cluster"
           exit! 1
         end

data/lib/etcd-tools/cli/etcd_erb.rb

@@ -34,7 +34,7 @@ module EtcdTools
 
         begin
           @etcd = etcd_connect @options[:url]
-        rescue EtcdTools::ClusterConnectError
+        rescue Etcd::ClusterConnectError
           $stderr.puts "Failed to connect to ETCD cluster"
           exit! 1
         end

data/lib/etcd-tools/cli/yaml2etcd.rb

@@ -46,7 +46,7 @@ module EtcdTools
 
         begin
           @etcd = etcd_connect @options[:url]
-        rescue EtcdTools::ClusterConnectError
+        rescue Etcd::ClusterConnectError
           $stderr.puts "Failed to connect to ETCD cluster"
           exit! 1
         end

data/lib/etcd-tools/etcd.rb

@@ -2,8 +2,6 @@ require 'etcd'
 require 'etcd-tools/mixins'
 
 module EtcdTools
-  class ClusterConnectError < Exception
-  end
 
   module Etcd
     def etcd_connect(url, timeout = 2)
@@ -14,7 +12,7 @@ module EtcdTools
         next unless etcd.healthy?
         return etcd
       end
-      raise EtcdTools::ClusterConnectError
+      raise Etcd::ClusterConnectError
     end
   end
 end

data/lib/etcd-tools/mixins/etcd.rb

@@ -2,6 +2,9 @@ require 'etcd'
 require 'etcd/client'
 
 module Etcd
+  class ClusterConnectError < RuntimeError
+  end
+
   class Client
 
     attr_reader :cluster
@@ -42,6 +45,7 @@ module Etcd
     end
 
     def cluster_http_request(req, options={})
+      errs = []
       cluster.each do |member|
         http = build_http_object(member[:host], member[:port], options)
         begin
@@ -50,18 +54,21 @@ module Etcd
           Log.debug("Response code: #{res.code}")
           Log.debug("Response body: #{res.body}")
           return process_http_request(res)
-        rescue Timeout::Error
+        rescue Timeout::Error => e
           Log.debug("Connection timed out on #{member[:host]}:#{member[:host]}")
+          errs << e
           next
-        rescue Errno::ECONNRESET
+        rescue Errno::ECONNRESET => e
           Log.debug("Connection reset on #{member[:host]}:#{member[:host]}")
+          errs << e
           next
-        rescue Errno::ECONNREFUSED
+        rescue Errno::ECONNREFUSED => e
           Log.debug("Connection refused on #{member[:host]}:#{member[:host]}")
+          errs << e
           next
         end
       end
-      fail "Couldn't connect to the ETCDcluster"
+      fail(Etcd::ClusterConnectError, "Couldn't connect to the ETCD cluster: #{errs.map(&:class).map(&:to_s)}")
     end
 
     def build_http_object(host, port, options={})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcd-tools
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Radek 'blufor' Slavicinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-30 00:00:00.000000000 Z
+date: 2016-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd