philae 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3070e46c6e7ad456cb58aae15d48fb71a9be1ec
-  data.tar.gz: f725eefd0197db384c7b9f2bbadb24af57572a8a
+  metadata.gz: c89dc51a566e3ab1b66da0e01b73f7203a571994
+  data.tar.gz: 2c226f8704ce011064bc1d459e3e64dcfc14103f
 SHA512:
-  metadata.gz: 221ed7de887838a7f07c526606d8f3f8b4265ad2aee873da6a969302c53dda543044f2f6f7e7604f1be41f3eaa8eef084a91d6ee030ea43ac2da26847c3ca713
-  data.tar.gz: a9d0f3571f98918907a90a01476d824385768e1f1dfc868ff1af82ed7a50f399c4cd0f3c73f87e069fa0cf4b52c08d18b5c7e34ebe3eb9f53f85895ac7193384
+  metadata.gz: 0e7868bab5c1a030919830409f8ed852e0be2a21ed08d6f75578b0ac052161fc416eb7b9d67278673b27d7e9a0ab3b58b294609bf76d49a16733d4ee36a115ab
+  data.tar.gz: 4c1dc3bd083e810d0ca158300f3d4b10eaba05624c0012693a1c7c3cfd548229d681bb2775cfb352281b5ae2ce4b8d6716c767e98b932d0f750244cc8b8d5ae8

data/lib/philae/http_probe.rb

@@ -1,27 +1,45 @@
 require 'net/http'
+require 'openssl'
 
 module Philae
   class HttpProbe
     attr_reader :name
 
-    def initialize(name, uri, username = nil, password = nil)
+    # tls_context:
+    # {
+    #   cert: "path/to/cert",
+    #   key: "path/to/key",
+    #   ca: "path/to/ca"
+    # }
+    def initialize(name, uri, username = nil, password = nil, tls_context = nil)
       @name = name
       @uri = uri
       @username = username
       @password = password
+      @tls_context = tls_context
     end
 
     def check
       begin
         uri = URI(@uri)
+        http = Net::HTTP.new(uri.host, uri.port)
+        if uri.scheme == "https"
+          http.use_ssl = true
+          if !@tls_context.nil?
+            http.cert = OpenSSL::X509::Certificate.new(File.read(@tls_context[:cert]))
+            http.key = OpenSSL::PKey::RSA.new(File.read(@tls_context[:key]))
+            http.ca_file = @tls_context[:ca]
+            http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          end
+        end
         req = Net::HTTP::Get.new(uri)
         req.basic_auth @username, @password if !@username.nil? || !@password.nil?
-        resp = Net::HTTP.start(uri.hostname, uri.port) do |http|
-          http.request(req)
+        resp = http.start do |httpconn|
+          httpconn.request(req)
         end
-        return { healthy: false, comment: 'Invalid response code' } if resp.code.to_s[0] != '2' && resp.code.to_s[0] != '3'
-      rescue
-        return { healthy: false, comment: 'Unable to contact server' }
+        return { healthy: false, comment: 'Invalid response code', code: resp.code.to_s } if resp.code.to_s[0] != '2' && resp.code.to_s[0] != '3'
+      rescue => e
+        return { healthy: false, comment: 'Unable to contact server', error: "#{e.class}: #{e.message}" }
       end
       { healthy: true, comment: '' }
     end

data/lib/philae/nsq_probe.rb

@@ -2,9 +2,14 @@ require File.join File.dirname(__FILE__), 'http_probe.rb'
 
 module Philae
   class NSQProbe < HttpProbe
-    def initialize(name, host, port = 4151)
+    def initialize(name, host, port = 4151, tls_context = nil)
       @name = name
-      @uri = "http://#{host}:#{port}/ping"
+      scheme = "http"
+      if !tls_context.nil?
+        scheme = "https"
+      end
+      @uri = "#{scheme}://#{host}:#{port}/ping"
+      @tls_context = tls_context
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: philae
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - leo@scalingo.com
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Provide an health check api