philae 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a72261c385f330a6ca14c7ddaccd3774aa4e0e0918eb754bf757ccf16627b0db
-  data.tar.gz: f38b28573ee5829bcd41c9a772c074c43dff746a44b18842aab6c4cd7059bc21
+  metadata.gz: 30d73e3e0425c11acc1fb1f03291b6d922b9141b077d5df15c82fd1bb654be9a
+  data.tar.gz: f2296b07a57836132bc39c34de390d54a19cf91b31fe91420629fac920ff1a5b
 SHA512:
-  metadata.gz: 270fd5405071f9f12369bafe35693eda220a29180107ae32c5e4aeb0ac16f8d34ad3e069c5f886695b84707512a84054fa51e94fcbfce1bcb904df85f9c78e3c
-  data.tar.gz: 80543e2c7e06be18b3569c50ba373fe5c071d290f1f7ad51ba65af41033c32b62f324b05cffdadd230f8f87ca342888e61218cb1df3d5dd58ff70377a5d66827
+  metadata.gz: 80374b372327ad433cfe231df3cba1e555af3225b4bc0747c66fa304885f08242058666a8d7853e64751666d15cd419d2d72a805ca8a71be1b32779f532de46e
+  data.tar.gz: 68507be35885a378a305df2172a718c331e8b51b1bd7b2b5630228d10a4d1cc21ddb82c5eb28b4e59f167fea9d8847905140b0c566f065ef5b26597f1d10efe6

data/lib/philae/http_probe.rb

@@ -11,12 +11,13 @@ module Philae
     #   key: "path/to/key",
     #   ca: "path/to/ca"
     # }
-    def initialize(name, uri, username = nil, password = nil, tls_context = nil)
+    def initialize(name, uri, username = nil, password = nil, tls_context = nil, timeout = nil)
       @name = name
       @uri = uri
       @username = username
       @password = password
       @tls_context = tls_context
+      @timeout = timeout
     end
 
     def check
@@ -32,6 +33,14 @@ module Philae
             http.verify_mode = OpenSSL::SSL::VERIFY_PEER
           end
         end
+
+        if !@timeout.nil?
+          http.read_timeout = @timeout
+          http.open_timeout = @timeout
+          http.write_timeout = @timeout
+          http.ssl_timeout = @timeout
+        end
+
         req = Net::HTTP::Get.new(uri)
         req.basic_auth @username, @password if !@username.nil? || !@password.nil?
         resp = http.start do |httpconn|

data/lib/philae/nsq_cluster_probe.rb

@@ -7,7 +7,7 @@ module Philae
 
     attr_reader :name, :nsq_probes
 
-    def self.new_from_env(name)
+    def self.new_from_env(name, opts = {})
       if ENV['NSQD_HOSTS'].nil? || ENV['NSQD_HTTP_PORT'].nil?
         raise ArgumentError, 'no NSQD_HOSTS and NSQD_HTTP_PORT defined'
       end
@@ -25,17 +25,17 @@ module Philae
         host.split(':')[0] + ":#{ENV['NSQD_HTTP_PORT']}"
       end
 
-      new(name, http_hosts, tls_context)
+      new(name, http_hosts, tls_context, opts)
     end
 
-    def initialize(name, hosts, tls_context = nil)
+    def initialize(name, hosts, tls_context = nil, opts = {})
       raise ArgumentError, 'should have at least one host' if hosts.nil? || hosts.empty?
 
       @name = name
       @nsq_probes = hosts.map do |hostport|
         host, port = hostport.split(':')
         port = DEFAULT_HTTP_PORT if port.nil?
-        next Philae::NSQProbe.new("#{name}-#{host}-#{port}", host, port, tls_context)
+        next Philae::NSQProbe.new("#{name}-#{host}-#{port}", host, port, tls_context, opts)
       end
     end
 

data/lib/philae/nsq_probe.rb

@@ -2,19 +2,19 @@ require File.join File.dirname(__FILE__), 'http_probe.rb'
 
 module Philae
   class NSQProbe < HttpProbe
-    def self.new_from_env(name)
+    def self.new_from_env(name, opts = {})
       if ENV["NSQD_TLS"] == "true"
         return self.new(name, ENV["NSQD_HOST"], ENV["NSQD_HTTP_PORT"], {
           cert: ENV["NSQD_TLS_CERT"],
           key:  ENV["NSQD_TLS_KEY"],
           ca:   ENV["NSQD_TLS_CACERT"],
-        })
+        }, opts)
       else
         return self.new(name, ENV["NSQD_HOST"], ENV["NSQD_HTTP_PORT"])
       end
     end
 
-    def initialize(name, host, port = 4151, tls_context = nil)
+    def initialize(name, host, port = 4151, tls_context = nil, opts = {})
       @name = name
       scheme = "http"
       if !tls_context.nil?
@@ -22,6 +22,7 @@ module Philae
       end
       @uri = "#{scheme}://#{host}:#{port}/ping"
       @tls_context = tls_context
+      @timeout = opts.fetch(:timeout, 5)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: philae
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - leo@scalingo.com
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Provide an health check API