philae 0.4.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30d73e3e0425c11acc1fb1f03291b6d922b9141b077d5df15c82fd1bb654be9a
-  data.tar.gz: f2296b07a57836132bc39c34de390d54a19cf91b31fe91420629fac920ff1a5b
+  metadata.gz: b1879dbb0b6c68dfea60305a4e13e41a15cb367cb594c60536b622f60c2bd0ff
+  data.tar.gz: d76a392ef7d0a3e6dcc990c646cdcf2d854ee2ad365e13a9615d85928008bd8b
 SHA512:
-  metadata.gz: 80374b372327ad433cfe231df3cba1e555af3225b4bc0747c66fa304885f08242058666a8d7853e64751666d15cd419d2d72a805ca8a71be1b32779f532de46e
-  data.tar.gz: 68507be35885a378a305df2172a718c331e8b51b1bd7b2b5630228d10a4d1cc21ddb82c5eb28b4e59f167fea9d8847905140b0c566f065ef5b26597f1d10efe6
+  metadata.gz: c06fae5ec1945301227fa594ec469d81d151507aa30b720959e94f02f76f8ddc6ef8e741a809aca03a2fc375efbe8257b5c5a84ba80ab9215c599cb3f8f900d5
+  data.tar.gz: 1938e6f8d4bff3e435c1826b5a18f18029b2bc1b0860c1e8a6196c75a3aee446c827f1938b392e25cb2f99860fe4ee3071907da01180634453f09fdda4f98f0b

data/lib/philae/docker_probe.rb

@@ -4,19 +4,19 @@ module Philae
   class DockerProbe
     attr_reader :name
 
-    def initialize(name, endpoint = '/var/run/docker.sock', options = nil)
+    def initialize(name, endpoint = '/var/run/docker.sock', options = {})
       @name = name
       @endpoint = endpoint
-      @docker_options = options
+      @docker_options = {read_timeout: 50, connect_timeout: 50}.merge(options)
     end
 
     def check
       Docker.url = @endpoint
-      Docker.options = @docker_options if !@docker_options.nil?
+      Docker.options = @docker_options
       begin
         Docker::Container.all
-      rescue
-        return { healthy: false, comment: 'Unable to communicate with docker' }
+      rescue => e
+        return { healthy: false, comment: "Unable to communicate with docker (#{e.message})" }
       end
 
       return { healthy: true, comment: '' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: philae
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.1
 platform: ruby
 authors:
 - leo@scalingo.com
@@ -10,22 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2024-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.33'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.33'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: etcd
   requirement: !ruby/object:Gem::Requirement
@@ -72,16 +78,22 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.18'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.18'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: 
 email: hello@scalingo.com
 executables: []
@@ -120,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Provide an health check API