dryad-consul 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f90d5b5fad7da7535c53c480e9bfaadb8833ee2d50d7e7eb01f489c75a0e4a93
-  data.tar.gz: 24035df45576e6aadbaae41716cd3b1e010c952f30c79730a5247c9cb561168d
+  metadata.gz: d753817e009be98a773228e8b5fcf6c66636bec0f2e6baa70b1e01ad3ae45482
+  data.tar.gz: 856dd2ceb5bfb940b9ccb68153b5bb443e4ad5c2fb1a2163684d632777744511
 SHA512:
-  metadata.gz: 53b99aabe4027bb678f3a1cd3201f817cfffebf7b9801279e9c74ee5b0dcd8df154e1f1b2260a7d78d85eca606d03295a8a76feac6b4ff4780e350446b982e4f
-  data.tar.gz: df04d80075f510e7743ef98de2ae292d85701e9d0fc5bd0af4c6c35495ca6802d6c9cfaf467ae82dfbbabc6ff258efde7d894f9eba7dbb06adb94d15e5f037b9
+  metadata.gz: 535f3a338b4022450d2d715759535e7951a3e325a8deb7fd5e061500bc30d74f4bf4c6bc528fe04c4c6a221197ab308bc2786a1d29ff636d29a694076bb05950
+  data.tar.gz: 48326d528f01eb302f9fd95570d144844c733a569054aac8c8b33cd3f6ccaa33670e499c9ea098dd6a5fe3fc23342adf907e7672c36e2fb880c5d870523bb75b

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dryad-consul (0.2.6)
+    dryad-consul (0.2.7)
       diplomat (~> 2.2, >= 2.2.4)
-      dryad-core (= 0.2.6)
+      dryad-core (= 0.2.7)
 
 GEM
   remote: https://rubygems.org/
@@ -13,7 +13,7 @@ GEM
     diplomat (2.2.5)
       deep_merge (~> 1.0, >= 1.0.1)
       faraday (~> 0.9)
-    dryad-core (0.2.6)
+    dryad-core (0.2.7)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     multipart-post (2.1.1)

data/lib/dryad/consul.rb

@@ -2,7 +2,6 @@ require "diplomat"
 require "dryad/core"
 require "dryad/consul/railtie" if defined?(Rails)
 require "dryad/consul/version"
-require "dryad/consul/service_client"
 require "dryad/consul/service_registry"
 require "dryad/consul/service"
 require "dryad/consul/key_value_client"

data/lib/dryad/consul/railtie.rb

@@ -13,13 +13,15 @@ module Dryad
       initializer "dryad_consul.update_active_record_connection" do
         config.after_initialize do
           db_path = "#{Dryad.configuration.namespace}/#{Dryad.configuration.group}/database.yml"
-          db_config = Dryad::Consul::ConfigProvider.load(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
-          raise e
-        rescue Exception => e
-          Rails.logger.warn e.message
+          begin
+            db_config = Dryad::Consul::ConfigProvider.load(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
+            raise e
+          rescue Exception => e
+            Rails.logger.warn e.message
+          end
         end
       end
     end

data/lib/dryad/consul/service_registry.rb

@@ -4,13 +4,13 @@ module Dryad
       class << self
         def register(service)
           service.to_registers.each do |register|
-            ServiceClient.register(register)
+            ::Diplomat::Service.register(register)
           end
         end
 
         def deregister(service)
           service.portals.each do |portal|
-            ServiceClient.deregister(portal.id)
+            ::Diplomat::Service.deregister(portal.id)
           end
         end
 

data/lib/dryad/consul/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryad-consul
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Pan Jie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-06-06 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.6
+        version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,6 @@ files:
 - lib/dryad/consul/key_value_client.rb
 - lib/dryad/consul/railtie.rb
 - lib/dryad/consul/service.rb
-- lib/dryad/consul/service_client.rb
 - lib/dryad/consul/service_registry.rb
 - lib/dryad/consul/version.rb
 homepage: https://github.com/jack0pan/dryad.rb

data/lib/dryad/consul/service_client.rb

@@ -1,15 +0,0 @@
-module Dryad
-  module Consul
-    class ServiceClient
-      class << self
-        def method_missing(name, *args, &block)
-          Diplomat::Service.send(name, *args, &block) || super
-        end
-
-        def respond_to_missing?(meth_id, with_private = false)
-          access_method?(meth_id) || super
-        end
-      end
-    end
-  end
-end