dryad-cluster 0.3.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47db0689f72f9ade1deb6c6636335eedd5b552fd1f95ee8e6864fc3830490f01
-  data.tar.gz: 10e0f512212026c39b8722886bbf66da659f3477c1e5accd0b664730087bafb5
+  metadata.gz: 0db3cbd897cd5145c8f1261ce24a798f8c6c2f1f7a4fc6f1f85f5e146692574e
+  data.tar.gz: 240feda3a42cdabef736f36b9776d54e824eaacad20d0d9873959c3a974023e5
 SHA512:
-  metadata.gz: cec169a54d5e5818ff752e1ffef690d60ac7228a39a009b521f26734a27519d596434c2607c6f5b9e714a3be943a146662fb2f53893aea6847a9f5e045c65ab7
-  data.tar.gz: 1a54bf2540313a87aba551862e8dd4839e3fcf4632ed370934dd7bc330b995c950e398fbbacf546baea58e000b33141c8511d6f039852ced7aa9e6dd2529008e
+  metadata.gz: 802b6786733904f184ff4d8f105459ebce7866c3abb612f085ff9bb8feb99fce49cb29d656e3c60dcc0024471a996480d35990e4bfdb96c29eeeedf513ed7cce
+  data.tar.gz: d3b5691eccaa81fa8fad6c630f06a449329ac6ce257fb6f5e81156314cdf9f83cbffc11628a2ad938ada736264e6acf4ab03fa391fd5e5a392dadcdd905fe0fd

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    dryad-cluster (0.3.4)
+    dryad-cluster (1.0.0)
       concurrent-ruby (~> 1.1, >= 1.1.5)
-      dryad-consul (= 0.3.4)
-      dryad-core (= 0.3.4)
+      dryad-consul (= 1.0.0)
+      dryad-core (= 1.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -15,11 +15,11 @@ GEM
     diplomat (2.2.5)
       deep_merge (~> 1.0, >= 1.0.1)
       faraday (~> 0.9)
-    dryad-consul (0.3.4)
+    dryad-consul (1.0.0)
       concurrent-ruby (~> 1.1, >= 1.1.5)
       diplomat (~> 2.2, >= 2.2.4)
-      dryad-core (= 0.3.4)
-    dryad-core (0.3.4)
+      dryad-core (= 1.0.0)
+    dryad-core (1.0.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     multipart-post (2.1.1)

data/lib/dryad/cluster.rb

@@ -4,6 +4,7 @@ require "dryad/consul"
 require "dryad/cluster/railtie" if defined?(Rails)
 require "dryad/cluster/version"
 require "dryad/cluster/round_robin"
+require "dryad/cluster/service_observer"
 
 module Dryad
   module Cluster
@@ -19,7 +20,8 @@ module Dryad
         full_name = Dryad::Core::Service.full_name(schema, service_name)
         if CLUSTERS[full_name].nil?
           CLUSTERS[full_name] = Dryad::Cluster::RoundRobin.new
-          CLUSTERS[full_name].set_services(sorted_instances(service_name, schema, groups))
+          observer = Dryad::Cluster::ServiceObserver.new(CLUSTERS[full_name])
+          CLUSTERS[full_name].set_services(sorted_instances(service_name, schema, groups, observer))
         end
         begin
           retries ||= 0
@@ -30,9 +32,9 @@ module Dryad
         end
       end
 
-      def sorted_instances(service_name, schema, groups)
-        registry = Object.const_get(@configuration.registry)
-        sis = registry.service_instances(service_name, schema, groups)
+      def sorted_instances(service_name, schema, groups, observer)
+        registry = Object.const_get(@configuration.registry).instance
+        sis = registry.service_instances(service_name, schema, groups, observer)
         sis.sort {|a, b| "#{a.address}:#{a.port}" <=> "#{b.address}:#{b.port}"}
       end
     end

data/lib/dryad/cluster/service_observer.rb

@@ -0,0 +1,14 @@
+module Dryad
+  module Cluster
+    class ServiceObserver < ::Dryad::Consul::ServiceObserver
+      def initialize(round_robin)
+        @round_robin = round_robin
+      end
+
+      def update_self(service_instances)
+        sis = service_instances.sort {|a, b| "#{a.address}:#{a.port}" <=> "#{b.address}:#{b.port}"}
+        @round_robin.set_services(sis)
+      end
+    end
+  end
+end

data/lib/dryad/cluster/version.rb

@@ -1,5 +1,5 @@
 module Dryad
   module Cluster
-    VERSION = '0.3.4'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryad-cluster
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Pan Jie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dryad-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: dryad-consul
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,7 @@ files:
 - lib/dryad/cluster.rb
 - lib/dryad/cluster/railtie.rb
 - lib/dryad/cluster/round_robin.rb
+- lib/dryad/cluster/service_observer.rb
 - lib/dryad/cluster/version.rb
 homepage: https://github.com/jack0pan/dryad.rb
 licenses: