dryad 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a98ce3f592db4619f50c3dd4771e518324abc821ae9018d5665d6df4f078a9af
-  data.tar.gz: dc808997b9151794e8ead44303b536ef7dfbf9b706e7615f14d563e9f3d6d833
+  metadata.gz: 1a83e68f41991b705835ebd2eeff92195fe239f58f484c0dbca1b0d68d85e11d
+  data.tar.gz: 187949a949a2b33bc6f53f5617f1d81b2cec60005240cab2a261a62de7103e0c
 SHA512:
-  metadata.gz: 33b78afb03003071970a9f96c60bfeab3e62d03cddf1fc7941b04cc8c7c1f032b5ea7a92808508fef62ce3c4b6c20fa3bb7cb93734249c852f7d30436feb3868
-  data.tar.gz: 298c46a4917aac6a2edf5fcdd060c3183a33eabc37058dc34e6903fc36466e61a8f5a03281d2dcc92fa8ef4e57b27c5096f7aa6590e1be31dddb20a9cda6ba9d
+  metadata.gz: 0d2570f9c228eb72688d2142973d040b32fc578c11f0a777a4f2482bcfe3c15c1ed33da03240714ef7799f6ddb5c704d61d2f676c6b54e2e7f1ec68b7b486a18
+  data.tar.gz: aa3d81845defb3b26c1e1bda3442565dfca6a4f5ac2552628c5952bbc531ebae9ac242279c192c516d61d04b280c8c7cbe6fae9cd1fce6356c449f8f00569359

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    dryad (1.0.0)
-      dryad-cluster (= 1.0.0)
-      dryad-consul (= 1.0.0)
-      dryad-core (= 1.0.0)
-    dryad-cluster (1.0.0)
+    dryad (1.0.1)
+      dryad-cluster (= 1.0.1)
+      dryad-consul (= 1.0.1)
+      dryad-core (= 1.0.1)
+    dryad-cluster (1.0.1)
       concurrent-ruby (~> 1.1, >= 1.1.5)
-      dryad-consul (= 1.0.0)
-      dryad-core (= 1.0.0)
-    dryad-consul (1.0.0)
+      dryad-consul (= 1.0.1)
+      dryad-core (= 1.0.1)
+    dryad-consul (1.0.1)
       concurrent-ruby (~> 1.1, >= 1.1.5)
       diplomat (~> 2.2, >= 2.2.4)
-      dryad-core (= 1.0.0)
-    dryad-core (1.0.0)
+      dryad-core (= 1.0.1)
+    dryad-core (1.0.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/dryad/railtie.rb

@@ -1,4 +1,5 @@
 require "rails"
+require "dryad"
 
 module Dryad
   class Railtie < Rails::Railtie
@@ -11,4 +12,50 @@ module Dryad
     end
   end
   ActiveSupport.run_load_hooks(:dryad, Core)
+
+  module Consul
+    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)
+        end
+      end
+
+      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.instance.load(db_path, observer)
+            raise Dryad::Core::ConfigurationNotFound, db_path if db_config.nil?
+            ActiveRecord::Base.configurations = YAML.load(ERB.new(db_config.payload).result)
+            ActiveRecord::Base.establish_connection(Rails.env.to_sym)
+          rescue Dryad::Core::ConfigurationNotFound => e
+            raise e
+          rescue Exception => e
+            Rails.logger.warn e.message
+          end
+        end
+      end
+    end
+  end
+  ActiveSupport.run_load_hooks(:dryad_consul, Consul)
+
+  module Cluster
+    class Railtie < Rails::Railtie
+      initializer "dryad_cluster.set_config" do
+        ActiveSupport.on_load(:dryad_cluster) do
+          Dryad::Cluster.configuration = Dryad.configuration
+        end
+      end
+    end
+  end
+  ActiveSupport.run_load_hooks(:dryad_cluster, Cluster)
 end

data/lib/dryad/version.rb

@@ -1,3 +1,3 @@
 module Dryad
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/dryad.rb

@@ -1,9 +1,9 @@
 require "dryad/version"
 require "dryad/configuration"
 require "dryad/core"
-require "dryad/railtie" if defined?(Rails)
 require "dryad/consul"
 require "dryad/cluster"
+require "dryad/railtie" if defined?(Rails)
 
 module Dryad
   class << self
@@ -36,5 +36,14 @@ module Dryad
     rescue => e
       raise e, "Cannot load dryad configuration:\n#{e.message}", e.backtrace
     end
+
+    def register_services
+      service = Dryad::Consul.build_service(
+        Dryad.configuration.namespace,
+        Dryad.configuration.group,
+        Dryad.configuration.service
+      )
+      Dryad::Consul::ServiceRegistry.instance.register(service)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryad
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Pan Jie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dryad-core
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: dryad-consul
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: dryad-cluster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement