dryad-consul 0.3.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48124ab15b6961d45ce9eed7d67fa9635e3a2390d7ba9f2f4754801c070f9476
-  data.tar.gz: fe916f91598b23ea9e2ad6183c3de57e43e15566b9ca1aa32bf812bb7d43a64b
+  metadata.gz: 951e59a7afbb4fc27b3c6fdaaf1e564935cb9b60820dee01a54eee3b27a454f0
+  data.tar.gz: ce86ce12cfb04787e9cbe18cf0b7e2c198681213af72bfe97de17ea8cac340d1
 SHA512:
-  metadata.gz: 43348516948c17e87f9bf592a20942b30f9312bfd9cb523df1ca4719de62ff2c9f02e9e49e2748389fc1e160cd32962048ae9dbb297c36f8db4c1e104981f4ce
-  data.tar.gz: da660ecc72ebbc4b689732988f12e0016f727235d6f06334e9b3f1742d753581cc2b9a21eba7bb945f7a46d92f60cf3c1bf71323a30f15b3f05ba3f92e8acfec
+  metadata.gz: 4e04cc80371617fb98804c3f720e263a386f40f90eddc0cc018d4dabcf1eb272e8e3f34bf97d33a2d22034619b8c973ee9a96fe99bb168958b0c3f10bbba8d18
+  data.tar.gz: 2eb6f2ba0f4355d9c23bfc953246cfd3c84d1e43cfd194c312818d5b08efb4caf738b0fffb9dfc6fbda215c885419e01df551a05002b250381cc59afbd24fb37

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    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 (= 1.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -15,7 +15,7 @@ GEM
     diplomat (2.2.5)
       deep_merge (~> 1.0, >= 1.0.1)
       faraday (~> 0.9)
-    dryad-core (0.3.4)
+    dryad-core (1.0.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     multipart-post (2.1.1)

data/lib/dryad/consul.rb

@@ -7,6 +7,7 @@ require "dryad/consul/service_registry"
 require "dryad/consul/service"
 require "dryad/consul/key_value_client"
 require "dryad/consul/config_provider"
+require "dryad/consul/service_observer"
 
 require "erb"
 

data/lib/dryad/consul/service_observer.rb

@@ -0,0 +1,17 @@
+module Dryad
+  module Consul
+    class ServiceObserver < ::Dryad::Core::Observer
+      def update(time, service_instances, exception)
+        if exception
+          puts "(#{time}) [#{self.class.to_s}] #{exception.message}"
+        elsif service_instances
+          update_self(service_instances)
+        end
+      end
+
+      def update_self(service_instances)
+        raise "Implement this method"
+      end
+    end
+  end
+end

data/lib/dryad/consul/service_registry.rb

@@ -1,43 +1,79 @@
+require 'singleton'
+require 'concurrent'
+
 module Dryad
   module Consul
     class ServiceRegistry
-      class << self
-        def register(service)
-          service.to_registers.each do |register|
-            ::Diplomat::Service.register(register)
-          end
+      include Singleton
+      WATCHER_EXECUTION_INTERVAL = 5 * 60
+
+      def initialize
+        @timers = {}
+      end
+
+      def register(service)
+        service.to_registers.each do |register|
+          ::Diplomat::Service.register(register)
         end
+      end
 
-        def deregister(service)
-          service.portals.each do |portal|
-            ::Diplomat::Service.deregister(portal.id)
-          end
+      def deregister(service)
+        service.portals.each do |portal|
+          ::Diplomat::Service.deregister(portal.id)
         end
+      end
 
-        def service_instances(name, schema, groups)
-          all_services = ::Diplomat::Health.service(Dryad::Core::Service.full_name(schema, name))
-          service_instances = []
-          all_services.each do |service|
-            service_hash = service.Service
-            if !service_hash["Meta"].nil? && service_hash["Meta"].has_key?("group") &&
-              groups.include?(service_hash["Meta"]["group"])
-              service_instances << service_hash
-            else
-              groups.each do |group|
-                if service_hash["Tags"].include?("group = \"#{group}\"")
-                  service_instances << service_hash
-                  break
-                end
+      def service_instances(name, schema, groups, observer = nil)
+        add_observer(observer, name, schema, groups) unless observer.nil?
+        _service_instances(name, schema, groups)
+      end
+
+      private
+      def _service_instances(name, schema, groups)
+        service_name = Dryad::Core::Service.full_name(schema, name)
+        all_services = ::Diplomat::Health.service(service_name)
+        service_instances = filter_services(all_services, groups)
+        service_instances.map do |service|
+          Dryad::Core::ServiceInstance.new(
+            name: name,
+            schema: schema,
+            address: service["Address"],
+            port: service["Port"]
+          )
+        end
+      end
+
+      def filter_services(all_services, groups)
+        service_hashs = []
+        all_services.each do |service|
+          service_hash = service.Service
+          if !service_hash["Meta"].nil? && service_hash["Meta"].has_key?("group") &&
+            groups.include?(service_hash["Meta"]["group"])
+            service_instances << service_hash
+          else
+            groups.each do |group|
+              if service_hash["Tags"].include?("group = \"#{group}\"")
+                service_hashs << service_hash
+                break
               end
             end
           end
-          service_instances.map do |service|
-            Dryad::Core::ServiceInstance.new(
-              name: name,
-              schema: schema,
-              address: service["Address"],
-              port: service["Port"]
-            )
+        end
+        service_hashs
+      end
+
+      def add_observer(observer, name, schema, groups)
+        if observer && observer.is_a?(Dryad::Consul::ServiceObserver)
+          service_name = Dryad::Core::Service.full_name(schema, name)
+          if @timers.has_key?(service_name)
+            @timers[service_name].add_observer(observer)
+          else
+            timer = Concurrent::TimerTask.new(execution_interval: WATCHER_EXECUTION_INTERVAL) do
+              _service_instances(service_name, groups)
+            end
+            timer.add_observer(observer)
+            timer.execute
+            @timers[service_name] = timer
           end
         end
       end

data/lib/dryad/consul/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryad-consul
 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,14 +16,14 @@ 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: diplomat
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,7 @@ files:
 - lib/dryad/consul/key_value_client.rb
 - lib/dryad/consul/railtie.rb
 - lib/dryad/consul/service.rb
+- lib/dryad/consul/service_observer.rb
 - lib/dryad/consul/service_registry.rb
 - lib/dryad/consul/version.rb
 homepage: https://github.com/jack0pan/dryad.rb