philae 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 70ea14a62ae9cc0750b373c086a56f734bef85ca
-  data.tar.gz: 95205429ab4bce4a145e504d281bc7b0ced29e63
+SHA256:
+  metadata.gz: 98c6b24b9ffa3987fffbb4a47f404e8d20e728663be1dd3a6953972bfab2a7d6
+  data.tar.gz: f646a2b162c96cf3eced95b894f75ab74e64a13fb9dc40618ebf6757a721a068
 SHA512:
-  metadata.gz: 8b97f1c5d6b4b22cbc345ca3bc136bcdfac9508c7fd94dfb557fbc8dcfc4b661987d846634f7513d453314c365f43dcd07a96adf9030c35835a8bb56bcc3cb73
-  data.tar.gz: b8e42c84fe8694b2b279c63c08b7c0c5923f925bc62f3d36f7955a3502e61157a299bf148dc6bfb97f8075ef8a860401cfbe8a2fb70e5a7ec4423621ac39d392
+  metadata.gz: c0a665aee100b59fa4057f1cb688aebf8fcf52282408142b3186d53da9e236522ad74c2945c26f0be66e38a377329cfb494863e24a85acde4f7ac72b4a7102e8
+  data.tar.gz: 8316c82012b480bb5cd6b43b2992a5b6e3712a78337031c51760903cc9d79a6962f71aeef5e1ed3a426a33c4d4ede4ddc0c99218c47835a5f881363cd4afd417

data/lib/philae/docker_probe.rb

@@ -12,14 +12,14 @@ module Philae
 
     def check
       Docker.url = @endpoint
-      Docker.options = @docker_options unless @docker_options.nil? # <3 Etienne
+      Docker.options = @docker_options if !@docker_options.nil?
       begin
         Docker::Container.all
       rescue
-        return {healthy: false, comment: 'Unable to communicate with docker'}
+        return { healthy: false, comment: 'Unable to communicate with docker' }
       end
 
-      { healthy: true, comment: '' }
+      return { healthy: true, comment: '' }
     end
   end
 end

data/lib/philae/etcd_probe.rb

@@ -48,7 +48,8 @@ module Philae
       rescue Exception => e
         return { healthy: false, comment: "Unable to contact etcd (#{e.message})" }
       end
-      { healthy: true, comment: '' }
+
+      return { healthy: true, comment: '' }
     end
   end
 end

data/lib/philae/http_probe.rb

@@ -41,7 +41,8 @@ module Philae
       rescue => e
         return { healthy: false, comment: 'Unable to contact server', error: "#{e.class}: #{e.message}" }
       end
-      { healthy: true, comment: '' }
+
+      return { healthy: true, comment: '' }
     end
   end
 end

data/lib/philae/mongo_probe.rb

@@ -20,7 +20,8 @@ module Philae
       rescue
         return { healthy: false, comment: 'Unable to contact mongo' }
       end
-      { healthy: true, comment: '' }
+
+      return { healthy: true, comment: '' }
     end
   end
 end

data/lib/philae/pgsql_probe.rb

@@ -0,0 +1,32 @@
+require 'pg'
+
+# Philae::PostgreSQLProbe tries to connect to the given connection string and
+# ping the database. The connection string must be in the form
+# `postgres://[username:password@]host1[:port1][/[database][?options]]`
+module Philae
+  class PostgreSQLProbe
+    attr_reader :name
+
+    def initialize(name, connection_string)
+      @name = name
+      @connection_string = connection_string
+    end
+
+    def check
+      begin
+        res = PG::Connection.ping(@connection_string)
+      rescue
+        return { healthy: false, comment: 'Unable to contact PostgreSQL' }
+      end
+      return { healthy: true, comment: '' } if res == PG::PQPING_OK
+
+      # https://deveiate.org/code/pg/PG/Connection.html#method-c-ping
+      reasons = {
+        PG::PQPING_REJECT => 'server is alive but rejecting connections',
+        PG::PQPING_NO_RESPONSE => 'could not establish connection',
+        PG::PQPING_NO_ATTEMPT => 'connection not attempted (bad params)',
+      }
+      return { healthy: false, comment: "Ping to PostgreSQL failed with the following reason: #{reasons[res]}" }
+    end
+  end
+end

data/lib/philae/prober.rb

@@ -18,10 +18,7 @@ module Philae
         probe[:healthy]
       end
 
-      {
-        healthy: global,
-        probes: probes_status
-      }
+      return { healthy: global, probes: probes_status }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: philae
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - leo@scalingo.com
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -27,19 +27,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.33'
 - !ruby/object:Gem::Dependency
-  name: mongo
+  name: etcd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -55,19 +55,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: etcd
+  name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
 description: 
 email: hello@scalingo.com
 executables: []
@@ -80,6 +80,7 @@ files:
 - lib/philae/http_probe.rb
 - lib/philae/mongo_probe.rb
 - lib/philae/nsq_probe.rb
+- lib/philae/pgsql_probe.rb
 - lib/philae/philae_probe.rb
 - lib/philae/prober.rb
 - lib/rack/philae_rack.rb
@@ -102,9 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Provide an health check api
+summary: Provide an health check API
 test_files: []