etcd-discovery 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e57668c1b22f2138645498ee2167d394a79ec885
-  data.tar.gz: 65d4e68662ed5e718a227c09a69fc0320c4f3343
+SHA256:
+  metadata.gz: 17118bb040e02a6a81848eb96bc6eab9490a2ed3c3f1c9718073580add409ebd
+  data.tar.gz: 8524c1cd5eee0558e12abadaa8478e95c418c92878328aa890d2ab2aad6a2781
 SHA512:
-  metadata.gz: 9f7373fef879ab09eace8559d7ffdec3bf1c8199e6a40cf2e00d0bce52fcf78d248c2dd2760107dce7f7440b203822cb3bd08fbf1d6ec34121c8213a6d62f7a6
-  data.tar.gz: 883d0474b82b3f0cc84fb7670d26729f21f767d1c36536cda5031d8b271df79ed983ba5cb2c31ea7a5f7459dd32efb96006bcd881485d60af4e35cf83374a5ca
+  metadata.gz: b1eb7a2fda116458395f0502ffcc44fd1e65083321b4eff7dc10ca3413b11d5ec5d0bac13df8b213228bc37482f09980f21267a70b04d871c1639c35b71f3fca
+  data.tar.gz: cfd3a9cae7bf06ebe471e8269f8f82f925d0aa59bd07cebd935e8b48bdabc0f7effa961cecb206c1509415557882d0546aac4a089f775fa596dba6aee5ea6616

data/lib/etcd-discovery/registrar.rb

@@ -54,7 +54,12 @@ module EtcdDiscovery
           @logger.warn "Watcher #{@service.attributes['name']} started"
           index = 0
           while @state == :started
-            resp = client.watch service_key, {index: index}
+            begin
+              resp = client.watch service_key, { index: index }
+            rescue => e
+              @logger.warn "Fail to watch #{service_key}: #{e}, #{e.message}, #{e.class}"
+              next
+            end
             value = JSON.parse resp.node.value
             @user = value['user']
             @password = value['password']

data/lib/etcd-discovery/service.rb

@@ -21,9 +21,9 @@ module EtcdDiscovery
       client = EtcdDiscovery.config.client
       begin
         service = client.get("/services_infos/#{service}")
-        return self.new service.node
+        return new service.node
       rescue Etcd::KeyNotFound
-        return self.new({'name' => service})
+        return new('name' => service)
       end
     end
 
@@ -34,35 +34,33 @@ module EtcdDiscovery
       rescue Etcd::KeyNotFound
         raise ServiceNotFound, attributes['name']
       end
-      if node.children.length == 0
-        raise ServiceNotFound, attributes['name']
-      end
-      hosts = []
-      node.children.each do |c|
-        hosts << Host.new(c)
-      end
-      return hosts
+      raise ServiceNotFound, attributes['name'] if node.children.empty?
+      return node.children.map { |c| Host.new(c) }
     end
 
     def one
       all.sample
     end
 
-    def to_uri(schemes = ["https", "http"])
+    def to_uri(schemes = ['https', 'http'])
       a = attributes
       return one.to_uri(schemes) unless a['public']
 
       schemes = [schemes] if !schemes.is_a?(Array)
-      scheme = schemes.select{|s|
-        !a['ports'][s].nil?
-      }.first
-      if a['user'].nil? || a['user'] == ""
+      scheme = schemes.reject do |s|
+        a['ports'][s].nil?
+      end.first
+      if a['user'].nil? || a['user'] == ''
         URI("#{scheme}://#{a['hostname']}:#{a['ports'][scheme]}")
       else
         URI("#{scheme}://#{a['user']}:#{a['password']}@#{a['hostname']}:#{a['ports'][scheme]}")
       end
     end
 
+    def to_s
+      to_uri.to_s
+    end
+
     def to_json
       attributes.to_json
     end

data/spec/spec_helper.rb

@@ -6,3 +6,11 @@ Bundler.require(:default, :development, :test)
 
 EtcdDiscovery.config.register_renew = 0.1
 
+require 'webmock/rspec'
+WebMock.disable_net_connect!(allow_localhost: false)
+
+require_relative "./etcd_helper"
+
+RSpec.configure do |config|
+  config.include(EtcdHelper)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcd-discovery
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Léo Unbekandt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd
@@ -58,8 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Service discovery based on etcd