kubernetes-health 3.0.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7237a6079afe249dc00d6f75a99b30c6ed594cc090f25d43b9677a63aee28f3
-  data.tar.gz: ec385cbc59cb999647c85d5ac1813585a55ffa283b9922f32dc2eceb55313d7d
+  metadata.gz: 33187ecbabbca1f845ed61bd7159731e7477d113fa83f319eeeb77e715458f12
+  data.tar.gz: 40059808df7f3f1f91b94f77583ab43a8bb8a6bc41df9794f1345f45b5f4c218
 SHA512:
-  metadata.gz: be3c95a034f79708968f24808656961f611819e6d559d6f24549fb497e99224d94369787911467886ca1f0ae2b5d2040ec42acd8b6b735d8b80bad5c1a790b02
-  data.tar.gz: 85cbe5b9902df2cbfa154fb642f3878fcd203ad1e6a3da05adb78c4f50974ebbc3844fe6018e5aae8115f281c0dbc92ccee5e134fd332096e49756ed7486c503
+  metadata.gz: 37f4e926a7a7d649b723c692f903b8863dc91ba8088e392ea2afeab1666fe20a43d411a56577fff4795ac1538c923cc320e1527a58cfb0da02e886dab62e9f15
+  data.tar.gz: abdc9fe6fcf8a28c508a2508d3e996887a936e125f8817e7a9756c10a24d7dac10c0d6330bb3d623325b8a940d571c37191fd3f0cbe8ccab96e5fddbc4cb5e86

data/README.md

@@ -15,7 +15,7 @@ This gem allows kubernetes monitoring your app while it is running migrates and
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'kubernetes-health', '~> 3.0'
+gem 'kubernetes-health', '~> 3.2'
 ```
 
 ## Enabling puma plugin
@@ -127,3 +127,11 @@ Kubernetes::Health::Config.route_liveness = '/liveness'
 Kubernetes::Health::Config.route_readiness = '/readiness'
 Kubernetes::Health::Config.route_metrics = '/metrics'
 ```
+
+## Customizing requests logs
+
+```
+Kubernetes::Health::Config.request_log_callback = lambda { |req, http_code|
+  Rails.logger.debug "Kubernetes Health: Rack on Migrate - Request: Path: #{req.path_info} / Params: #{req.params} /  HTTP Code: #{http_code}"  rescue nil
+}
+```

data/kubernetes-health.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_dependency "rack"
   spec.add_dependency "rails"
-  spec.add_runtime_dependency 'prometheus-client', '~> 0.8'
-  spec.add_runtime_dependency 'puma', '~> 3.0'
+  spec.add_runtime_dependency 'prometheus-client', '~> 0.9.0'
+  spec.add_runtime_dependency 'puma'
 end

data/lib/kubernetes/health/config.rb

@@ -8,6 +8,11 @@ module Kubernetes
       @@route_liveness = '/_liveness'
       @@route_readiness = '/_readiness'
       @@route_metrics = '/_metrics'
+      
+      @@request_log_callback = lambda { |req, http_code|
+        Rails.logger.debug "Kubernetes Health: Rack on Migrate - Request: Path: #{req.path_info} / Params: #{req.params} /  HTTP Code: #{http_code}"  rescue nil
+      }
+
       @@lock_or_wait = lambda { ActiveRecord::Base.connection.execute 'select pg_advisory_lock(123456789123456789);' }
       @@unlock = lambda { ActiveRecord::Base.connection.execute 'select pg_advisory_unlock(123456789123456789);' }
 
@@ -18,6 +23,14 @@ module Kubernetes
       def self.lock_or_wait=(value)
         @@lock_or_wait = value
       end
+      
+      def self.request_log_callback
+        @@request_log_callback
+      end
+
+      def self.request_log_callback=(value)
+        @@request_log_callback = value
+      end
 
       def self.unlock
         @@unlock

data/lib/kubernetes/health/rack_on_migrate.rb

@@ -11,7 +11,7 @@ module Kubernetes
         else
           http_code = 404
         end
-        Rails.logger.info "Kubernetes Health: Rack on Migrate - Request: Path: #{req.path_info} / Params: #{req.params} /  HTTP Code: #{http_code}"
+        ::Kubernetes::Health::Config.request_log_callback.call(req, http_code)
         [http_code, {}, []]
       end
     end

data/lib/kubernetes/health/version.rb

@@ -1,5 +1,5 @@
 module Kubernetes
   module Health
-    VERSION = "3.0.2"
+    VERSION = "3.2.0"
   end
 end

data/lib/puma/kubernetes/app.rb

@@ -13,25 +13,30 @@ module Puma
       end
 
       def call(_env)
-        req = ::Rack::Request.new(_env)
-        type = {}
-        content = []
-        case req.path_info
-        when ::Kubernetes::Health::Config.route_readiness
-          i_am_live = ::Kubernetes::Health::Config.live_if.arity == 0 ? ::Kubernetes::Health::Config.live_if.call : ::Kubernetes::Health::Config.live_if.call(req.params)
-          http_code = i_am_live ? 200 : 503
-        when ::Kubernetes::Health::Config.route_liveness
-          i_am_ready = ::Kubernetes::Health::Config.ready_if.arity == 0 ? ::Kubernetes::Health::Config.ready_if.call : ::Kubernetes::Health::Config.ready_if.call(req.params)
-          http_code = i_am_ready ? 200 : 503
-        when ::Kubernetes::Health::Config.route_metrics
-          http_code = 200
-          @parser.parse JSON.parse(@launcher.stats)
+        begin
+          req = ::Rack::Request.new(_env)
+          type = {}
+          content = []
           type = { 'Content-Type' => 'text/plain' }
-          content = [Prometheus::Client::Formats::Text.marshal(Prometheus::Client.registry)]
-        else
-          http_code = 404
+          case req.path_info
+          when ::Kubernetes::Health::Config.route_liveness
+            i_am_live = ::Kubernetes::Health::Config.live_if.arity == 0 ? ::Kubernetes::Health::Config.live_if.call : ::Kubernetes::Health::Config.live_if.call(req.params)
+            http_code = i_am_live ? 200 : 503
+          when ::Kubernetes::Health::Config.route_readiness
+            i_am_ready = ::Kubernetes::Health::Config.ready_if.arity == 0 ? ::Kubernetes::Health::Config.ready_if.call : ::Kubernetes::Health::Config.ready_if.call(req.params)
+            http_code = i_am_ready ? 200 : 503
+          when ::Kubernetes::Health::Config.route_metrics
+            http_code = 200
+            @parser.parse JSON.parse(@launcher.stats)
+            content = [Prometheus::Client::Formats::Text.marshal(Prometheus::Client.registry)]
+          else
+            http_code = 404
+          end
+        rescue
+          http_code = 500
+          content = []
         end
-        Rails.logger.info "Kubernetes Health: Rack on Migrate - Request: Path: #{req.path_info} / Params: #{req.params} /  HTTP Code: #{http_code}" rescue nil
+        ::Kubernetes::Health::Config.request_log_callback.call(req, http_code)
         [http_code, type, content]
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-health
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Wagner Caixeta
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: "\n    This gem allows kubernetes monitoring your app while it is running
   migrates and after it started.\n    Features:\n    * add routes /_readiness and
   /_liveness on rails stack by default;\n    * allow custom checks for /_readiness
@@ -145,7 +145,7 @@ files:
 homepage: https://github.com/platbr/kubernetes-health
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,8 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: This gem allows kubernetes monitoring your app while it is running migrates
   and after it started.