dryad-consul 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 951e59a7afbb4fc27b3c6fdaaf1e564935cb9b60820dee01a54eee3b27a454f0
-  data.tar.gz: ce86ce12cfb04787e9cbe18cf0b7e2c198681213af72bfe97de17ea8cac340d1
+  metadata.gz: 81a3b8b9de62325983f37abf4941b498727632bce970e46272eb0a1214d97b29
+  data.tar.gz: 0c960ad4cfaa9bf517d28058c381cef0b28e71d4e25b3b739fc460864743a438
 SHA512:
-  metadata.gz: 4e04cc80371617fb98804c3f720e263a386f40f90eddc0cc018d4dabcf1eb272e8e3f34bf97d33a2d22034619b8c973ee9a96fe99bb168958b0c3f10bbba8d18
-  data.tar.gz: 2eb6f2ba0f4355d9c23bfc953246cfd3c84d1e43cfd194c312818d5b08efb4caf738b0fffb9dfc6fbda215c885419e01df551a05002b250381cc59afbd24fb37
+  metadata.gz: 0a9daa27bf4aa030d0c507305a2c8cbf07bf964840301067348c46556e00880dc65a8df88cfa59df9989ade601e781d2ee84c9aac096193cd59981cb288e5da3
+  data.tar.gz: fbdc715e93107f64bfc681c177bb3ffb41b1d22344d8cca3e262e9af0728fd76f216bf5ce716ed76ad9a086c878bfe72c8935a655a78993ae7b62780f322490e

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    dryad-consul (1.0.0)
+    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.1)
 
 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 (1.0.0)
+    dryad-core (1.0.1)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     multipart-post (2.1.1)

data/lib/dryad/consul.rb

@@ -1,15 +1,13 @@
 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"
 require "dryad/consul/service"
 require "dryad/consul/key_value_client"
 require "dryad/consul/config_provider"
 require "dryad/consul/service_observer"
-
-require "erb"
+require "dryad/consul/health_check"
 
 module Dryad
   module Consul
@@ -20,12 +18,58 @@ module Dryad
         if consul[:username].nil? || consul[:password].nil?
           url = "http://#{consul[:host]}:#{consul[:port]}"
         else
+          require "erb"
           url = "http://#{consul[:username]}:#{ERB::Util.url_encode(consul[:password])}@#{consul[:host]}:#{consul[:port]}"
         end
         ::Diplomat.configure do |config|
           config.url = url
         end
       end
+
+      def build_check(check_config, name, address, port)
+        if check_config
+          interval = check_config[:interval] || 10
+          if !check_config[:url].nil?
+            http = check_config[:url]
+            http = "#{k.to_s}://#{address}:#{port}#{url}" if http.start_with?("/")
+            timeout = check_config[:timeout] || 5
+            Dryad::Consul::HTTPHealthCheck.new(http, interval, timeout, interval * 10)
+          elsif !check_config[:grpc_use_tls].nil?
+            grpc = "#{address}:#{port}/#{name}"
+            Dryad::Consul::GRPCHealthCheck.new(grpc, interval, check_config[:grpc_use_tls], interval * 10)
+          else
+            Dryad::Consul::TTLHealthCheck.new(interval, interval * 10)
+          end
+        else
+          Dryad::Consul::TTLHealthCheck.new(10, 100)
+        end
+      end
+  
+      def build_service(name, group, service_config)
+        address = if service_config[:address]
+          service_config[:address]
+        else
+          require 'socket'
+          Socket.ip_address_list.detect{|ai| ai.ipv4_private?}&.ip_address
+        end
+        schemas = Dryad::Core::Schema.constants.map{|s| Dryad::Core::Schema.const_get(s).to_sym}
+        portals = service_config.slice(*schemas).map do |k, v|
+          params = v.slice(:port, :non_certifications).merge({
+            schema: k.to_s,
+            pattern: v[:pattern] || "/.*",
+            check: build_check(v[:check], name, address, v[:port])
+          })
+          Dryad::Core::Portal.new(params)
+        end
+        Dryad::Consul::Service.new({
+          name: name,
+          group: group,
+          address: address,
+          portals: portals,
+          priority: service_config[:priority] || 0,
+          load_balancing: service_config[:load_balancing] || []
+        })
+      end
     end
   end
 end

data/lib/dryad/consul/health_check.rb

@@ -1,40 +1,47 @@
 module Dryad
   module Consul
     class HealthCheck
-      attr_accessor :deregister_critial_service_after
+      attr_accessor :deregister_critical_service_after
 
       def initialize(duration)
-        @deregister_critial_service_after = duration
+        @deregister_critical_service_after = "#{duration}s"
+      end
+
+      def attributes
+        self.instance_variables.map do |attribute|
+          key = attribute.to_s.gsub('@', '')
+          [key, self.instance_variable_get(attribute)]
+        end.to_h
       end
     end
 
     class TTLHealthCheck < HealthCheck
       attr_accessor :ttl
 
-      def initialize(ttl, deregister_critial_service_after)
-        super(deregister_critial_service_after)
-        @ttl = ttl
+      def initialize(ttl, deregister_critical_service_after)
+        super(deregister_critical_service_after)
+        @ttl = "#{ttl}s"
       end
     end
 
     class HTTPHealthCheck < HealthCheck
       attr_accessor :http, :interval, :timeout
 
-      def initialize(http, interval, timeout, deregister_critial_service_after)
-        super(deregister_critial_service_after)
+      def initialize(http, interval, timeout, deregister_critical_service_after)
+        super(deregister_critical_service_after)
         @http = http
-        @interval = interval
-        @timeout = timeout
+        @interval = "#{interval}s"
+        @timeout = "#{timeout}s"
       end
     end
 
     class GRPCHealthCheck < HealthCheck
       attr_accessor :grpc, :interval, :grpc_use_tls
 
-      def initialize(grpc, interval, grpc_use_tls, deregister_critial_service_after)
-        super(deregister_critial_service_after)
+      def initialize(grpc, interval, grpc_use_tls, deregister_critical_service_after)
+        super(deregister_critical_service_after)
         @grpc = grpc
-        @interval = interval
+        @interval = "#{interval}s"
         @grpc_use_tls = grpc_use_tls
       end
     end

data/lib/dryad/consul/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryad-consul
 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,14 +16,14 @@ 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: diplomat
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,6 @@ files:
 - lib/dryad/consul/config_provider.rb
 - lib/dryad/consul/health_check.rb
 - 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

data/lib/dryad/consul/railtie.rb

@@ -1,39 +0,0 @@
-require "rails"
-require "dryad"
-
-module Dryad
-  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)
-end