philae 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db79bb92141b6234559b57f1d9cb0e0ef79bed45
-  data.tar.gz: '08c32572e4c8544f8cbad1d32b99f0e94ad93823'
+  metadata.gz: 4fb2abe798bfe65ac1f77da6a0284195eb73db03
+  data.tar.gz: 841db519d68f08b8de7187415b5d428391154780
 SHA512:
-  metadata.gz: c916f5131503c773392885413638cf307d7b0cd1a7a5417aaaf466b6615e887a746ab6a12610295ae655912f0e2172580afba0125a1e4feea37516c0297b8dc9
-  data.tar.gz: c074e162e193e76af19ac28ad8c244a9cbfa4f08265b6f24249b2d85ff86038eb55a1de1400966460cf3f21e6871499995aa4bbfa2886a41a1f1e1e639e66c59
+  metadata.gz: 3c43748351457a9cdbe040a88fa8d557e47aae050fe73f3574e0ae56dafd22455d3ac940fc273239d328467bc9630714dba3fa5ae6963737cc5327cbcca08f21
+  data.tar.gz: 15527a9c4fa412943be8af12fdcaf96d8badf7d28c113798c987871954cfec84b8c7d1b323fe2b3077afc9a591f19cc41b996cf53c6e27ba37cecd71c4befc06

data/lib/philae/docker_probe.rb

@@ -16,10 +16,10 @@ module Philae
       begin
         Docker::Container.all
       rescue
-        return false
+        return {healthy: false, comment: 'Unable to communicate with docker'}
       end
 
-      true
+      { healthy: true, comment: '' }
     end
   end
 end

data/lib/philae/http_probe.rb

@@ -19,12 +19,11 @@ module Philae
         resp = Net::HTTP.start(uri.hostname, uri.port) do |http|
           http.request(req)
         end
-
-        return false if resp.code.to_s[0] != '2' && resp.code.to_s[0] != '3'
+        return { healthy: false, comment: 'Invalid response code' } if resp.code.to_s[0] != '2' && resp.code.to_s[0] != '3'
       rescue
-        return false
+        return { healthy: false, comment: 'Unable to contact server' }
       end
-      true
+      { healthy: true, comment: '' }
     end
   end
 end

data/lib/philae/mongo_probe.rb

@@ -11,13 +11,13 @@ module Philae
 
     def check
       begin
-        client = Mongo::Client.new(@uri)
-        db = client.datbase
+        client = Mongo::Client.new(@uri, max_read_retries: 1)
+        db = client.database
         db.collection_names
       rescue
-        return false
+        return { healthy: false, comment: 'Unable to conctact mongo' }
       end
-      true
+      { healthy: true, comment: '' }
     end
   end
 end

data/lib/philae/philae_probe.rb

@@ -21,12 +21,18 @@ module Philae
           http.request(req)
         end
 
-        return false if resp.code.to_s[0] != '2' && resp.code.to_s[0] != '3'
+        if resp.code.to_s[0] != '2' && resp.code.to_s[0] != '3'
+          return { healthy: false, comment: 'Invalid return code' }
+        end
 
         status = JSON.parse(resp.body)
-        return status['healthy']
+        if status['healthy']
+          return { healthy: true, comment: '' }
+        else
+          return { healthy: false, comment: 'node not healthy' }
+        end
       rescue
-        return false
+        return { healthy: false, comment: 'Unable to contact server' }
       end
     end
   end

data/lib/philae/prober.rb

@@ -10,7 +10,8 @@ module Philae
 
     def check
       probes_status = @probes.map do |probe|
-        { name: probe.name, healthy: probe.check }
+        status = probe.check
+        { name: probe.name, healthy: status[:healthy], comment: status[:comment] }
       end
 
       global = probes_status.all? do |probe|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: philae
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - leo@scalingo.com