dryad-consul 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d753817e009be98a773228e8b5fcf6c66636bec0f2e6baa70b1e01ad3ae45482
-  data.tar.gz: 856dd2ceb5bfb940b9ccb68153b5bb443e4ad5c2fb1a2163684d632777744511
+  metadata.gz: ebfad19cea21ae94dd248931ed5a37afbdd59f60ec9a65902b33c77c3bd9ffad
+  data.tar.gz: 42de2e60a31f501314c04adc676720f10eac9f23499efcaf4b0b59eaf6713d18
 SHA512:
-  metadata.gz: 535f3a338b4022450d2d715759535e7951a3e325a8deb7fd5e061500bc30d74f4bf4c6bc528fe04c4c6a221197ab308bc2786a1d29ff636d29a694076bb05950
-  data.tar.gz: 48326d528f01eb302f9fd95570d144844c733a569054aac8c8b33cd3f6ccaa33670e499c9ea098dd6a5fe3fc23342adf907e7672c36e2fb880c5d870523bb75b
+  metadata.gz: 4ac0341de021e32e7e7cedd25412a0c108c02fb085ca20c9c05bc28cd43f5c68a034ca018e2927fc1dd64e44c0b6b673a27ac62adf2725199328cb07246e9054
+  data.tar.gz: bb233a9b8c98588d0fa00fb9d17f1b103ab62e0a22b16ab346811eee1d6554174dbbf8bf1d57e2c2b8cb186f346d291cbdc378e78ab9728a6a27c5ee56d5788c

data/Gemfile.lock

@@ -1,19 +1,21 @@
 PATH
   remote: .
   specs:
-    dryad-consul (0.2.7)
+    dryad-consul (0.3.0)
+      concurrent-ruby (~> 1.1, >= 1.1.5)
       diplomat (~> 2.2, >= 2.2.4)
-      dryad-core (= 0.2.7)
+      dryad-core (= 0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    concurrent-ruby (1.1.5)
     deep_merge (1.2.1)
     diff-lcs (1.3)
     diplomat (2.2.5)
       deep_merge (~> 1.0, >= 1.0.1)
       faraday (~> 0.9)
-    dryad-core (0.2.7)
+    dryad-core (0.3.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     multipart-post (2.1.1)

data/dryad-consul.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "dryad-core", Dryad::Consul::VERSION
   spec.add_dependency "diplomat", "~> 2.2", ">= 2.2.4"
+  spec.add_dependency "concurrent-ruby", "~> 1.1", ">= 1.1.5"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/dryad/consul/config_observer.rb

@@ -0,0 +1,24 @@
+module Dryad
+  module Consul
+    class ConfigObserver < ::Dryad::Core::Observer
+      def initialize
+        @last_version = 0
+      end
+
+      def update(time, config_desc, exception)
+        if exception
+          puts "(#{time}) [#{self.class.to_s}] #{exception.message}"
+        elsif config_desc
+          if @last_version < config_desc.version
+            update_self(config_desc)
+            @last_version = config_desc.version
+          end
+        end
+      end
+
+      def update_self(config_desc)
+        raise "Implement this method"
+      end
+    end
+  end
+end

data/lib/dryad/consul/config_provider.rb

@@ -1,13 +1,43 @@
+require 'singleton'
+require 'concurrent'
+
 module Dryad
   module Consul
     class ConfigProvider < Dryad::Core::ConfigProvider
-      class << self
-        def load(path, listener = nil)
-          config = Dryad::Consul::KeyValueClient.get(path)
-          if config.nil?
-            raise Dryad::Core::ConfigurationNotFound, path
+      include Singleton
+      WATCHER_EXECUTION_INTERVAL = 5 * 60
+
+      def initialize
+        @timers = {}
+      end
+
+      def load(path, observer = nil)
+        config = Dryad::Consul::KeyValueClient.get(path)
+        if config.nil?
+          nil
+        else
+          add_observer(observer, path)
+          Dryad::Core::ConfigDesc.new(path, config.Value, config.ModifyIndex)
+        end
+      end
+
+      private
+      def add_observer(observer, path)
+        if observer && observer.is_a?(Dryad::Core::Observer)
+          if @timers.has_key?(path)
+            @timers[path].add_observer(observer)
           else
-            Dryad::Core::ConfigDesc.new(path, config.Value, config.ModifyIndex)
+            timer = Concurrent::TimerTask.new(execution_interval: WATCHER_EXECUTION_INTERVAL) do
+              config = Dryad::Consul::KeyValueClient.get(path)
+              if config.nil?
+                nil
+              else
+                Dryad::Core::ConfigDesc.new(path, config.Value, config.ModifyIndex)
+              end
+            end
+            timer.add_observer(observer)
+            timer.execute
+            @timers[path] = timer
           end
         end
       end

data/lib/dryad/consul/railtie.rb

@@ -3,7 +3,14 @@ require "dryad"
 
 module Dryad
   module Consul
-    class Railtie < Rails::Railtie
+    class DBConfigObserver < ConfigObserver
+      def update_self(config_desc)
+        ActiveRecord::Base.configurations = YAML.load(ERB.new(config_desc.payload).result)
+        ActiveRecord::Base.establish_connection(Rails.env.to_sym)
+      end
+    end
+
+    class Railtie < ::Rails::Railtie
       initializer "dryad_consul.set_consul" do
         ActiveSupport.on_load(:dryad_consul) do
           Dryad::Consul.configure_consul(Dryad.configuration)
@@ -13,8 +20,10 @@ module Dryad
       initializer "dryad_consul.update_active_record_connection" do
         config.after_initialize do
           db_path = "#{Dryad.configuration.namespace}/#{Dryad.configuration.group}/database.yml"
+          observer = ::Dryad::Consul::DBConfigObserver.new
           begin
-            db_config = Dryad::Consul::ConfigProvider.load(db_path)
+            db_config = Dryad::Consul::ConfigProvider.instance.load(db_path, observer)
+            raise Dryad::Core::ConfigurationNotFound, db_path
             ActiveRecord::Base.configurations = YAML.load(ERB.new(db_config.payload).result)
             ActiveRecord::Base.establish_connection(Rails.env.to_sym)
           rescue Dryad::Core::ConfigurationNotFound => e

data/lib/dryad/consul/version.rb

@@ -1,5 +1,5 @@
 module Dryad
   module Consul
-    VERSION = '0.2.7'
+    VERSION = '0.3.0'
   end
 end

data/lib/dryad/consul.rb

@@ -1,5 +1,6 @@
 require "diplomat"
 require "dryad/core"
+require "dryad/consul/config_observer"
 require "dryad/consul/railtie" if defined?(Rails)
 require "dryad/consul/version"
 require "dryad/consul/service_registry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryad-consul
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Pan Jie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-06-14 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.2.7
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +44,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.4
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +124,7 @@ files:
 - bin/setup
 - dryad-consul.gemspec
 - lib/dryad/consul.rb
+- lib/dryad/consul/config_observer.rb
 - lib/dryad/consul/config_provider.rb
 - lib/dryad/consul/key_value_client.rb
 - lib/dryad/consul/railtie.rb