rx-healthcheck 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1566710004f2caf4611964415d144921c8d6ea9b32936ca08fba2189282042e
-  data.tar.gz: ca37d15363b876ebabf6bc2d0fb5cf13cd156e51c2afb29dc0860e7aa8f9f613
+  metadata.gz: 9a5089cc2aca4dab181a11a5aa9a3135862d7de57976ded482366a9e147ac7a8
+  data.tar.gz: 4ec642b3e93f6b0f983cb7dff58b4bed8ede3e64dd7655bd1cac7f76583c7dfe
 SHA512:
-  metadata.gz: e474fcde410e1c2f73e4e48cfd4588c227d29d6ad2b443a7f5a92c4c64542cd334e766212ed9ade803b2fd4344a75351129209c116c7e5830f1aa3ecf1ef881e
-  data.tar.gz: d4e3a2fd87c407e13cd645afa4b07a3f4ffc68457515a69ea360b1c6761431e9df1bb1629d500366cab7ab9b436afef516b31c063acf3306de5e31a5bdf3e8bf
+  metadata.gz: 439bc089d1ce63f1c63f687cdf0b8b473bbcb2f6bbf3c04a847905d176cdb667e6f6c3b6e754121af685b87fc2b00f318ca3e4c6fc2de17fd80cd4cd88693ff2
+  data.tar.gz: 37c97bcd6967d3d336e669d78b6474978771c0d7dbc79daca8276dd66484c2485398f1cc6bd888c5f46f63e4855c33c9b4bb70a7b7e042937b588259e7b61a0f

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rx-healthcheck (0.1.1)
+    rx-healthcheck (0.1.4)
 
 GEM
   remote: https://rubygems.org/

data/lib/rx/check/file_system_check.rb

@@ -3,17 +3,20 @@ module Rx
     class FileSystemCheck
       FILENAME = "rx".freeze
 
-      attr_reader :name
+      attr_reader :name, :timeout
 
-      def initialize(name = "fs")
+      def initialize(name = "fs", timeout = 0)
         @name = name
+        @timeout = 0
       end
 
       def check
         Result.from(name) do
-          !!Tempfile.open(FILENAME) do |f|
-            f.write("ok")
-            f.flush
+          Timeout::timeout(timeout) do
+            !!Tempfile.open(FILENAME) do |f|
+              f.write("ok")
+              f.flush
+            end
           end
         end
       end

data/lib/rx/check/generic_check.rb

@@ -1,16 +1,19 @@
+require "timeout"
+
 module Rx
   module Check
     class GenericCheck
-      attr_reader :name
+      attr_reader :name, :timeout
 
-      def initialize(callable, name = "generic")
+      def initialize(callable, name = "generic", timeout = 0)
         @callable = callable
         @name = name
+        @timeout = timeout
       end
 
       def check
         Result.from(name) do
-          callable.call
+          Timeout::timeout(timeout) { callable.call }
         end
       end
 

data/lib/rx/check/http_check.rb

@@ -3,17 +3,18 @@ require "uri"
 module Rx
   module Check
     class HttpCheck
-      attr_reader :name
+      attr_reader :name, :timeout
 
-      def initialize(url, name = "http")
+      def initialize(url, name = "http", timeout: 1)
         @url = URI(url)
         @name = name
+        @timeout = timeout
       end
 
       def check
         Result.from(name) do
           http = Net::HTTP.new(url.host, url.port)
-          http.read_timeout = 1
+          http.read_timeout = timeout
           http.use_ssl = url.scheme == "https"
 
           response = http.request(Net::HTTP::Get.new(path))

data/lib/rx/check/result.rb

@@ -2,7 +2,7 @@ module Rx
   module Check
     class Result
       def self.from(check_name)
-        start_at = Time.now
+        start_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         err = nil
         result = false
 
@@ -12,7 +12,7 @@ module Rx
           err = ex
         end
 
-        end_at = Time.now
+        end_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
         Result.new(check_name, result, ((end_at - start_at) * 1000).round(2), err)
       end

data/lib/rx/concurrent/future.rb

@@ -14,6 +14,10 @@ module Rx
         Future.new(&block).execute
       end
 
+      def self.thread_pool
+        @@pool
+      end
+
       def initialize(&block)
         @channel = Queue.new
         @state = :pending

data/lib/rx/concurrent/thread_pool.rb

@@ -6,6 +6,7 @@ module Rx
       def initialize(size = Etc.nprocessors)
         @pool = []
         @size = size
+        @pid = Process.pid
       end
 
       def shutdown
@@ -25,17 +26,33 @@ module Rx
         self
       end
 
+      def restart
+        shutdown
+        start
+      end
+
       def started?
         pool.map(&:alive?).any?
       end
 
       def submit(&block)
+        restart_on_fork if forked?
+
         return unless started?
         queue << block
       end
 
       private
-      attr_reader :pool, :queue, :size
+      attr_reader :pid, :pool, :queue, :size
+
+      def forked?
+        Process.pid != pid
+      end
+
+      def restart_on_fork
+        restart
+        @pid = Process.pid
+      end
 
       def worker
         -> {

data/lib/rx/middleware.rb

@@ -23,11 +23,11 @@ module Rx
     end
 
     def call(env)
-      unless health_check_request?(env)
+      unless health_check_request?(path(env))
         return app.call(env)
       end
 
-      case env["REQUEST_PATH"]
+      case path(env)
       when "/liveness"
         ok = check_to_component(liveness_checks).map { |x| x[:status] == 200 }.all?
         liveness_response(ok)
@@ -57,14 +57,18 @@ module Rx
       Rx::Cache::InMemoryCache.new
     end
 
-    def health_check_request?(env)
-      %w[/liveness /readiness /deep].include?(env["REQUEST_PATH"])
+    def health_check_request?(path)
+      %w[/liveness /readiness /deep].include?(path)
     end
 
     def liveness_response(is_ok)
       [is_ok ? 200 : 503, {}, []]
     end
 
+    def path(env)
+      env["PATH_INFO"] || env["REQUEST_PATH"] || env["REQUEST_URI"]
+    end
+
     def readiness_response(components)
       status = components.map { |x| x[:status] == 200 }.all? ? 200 : 503
 

data/lib/rx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rx
-  VERSION = "0.1.2"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rx-healthcheck
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors:
 - Zach Pendleton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Standard health checks for Rails and Rack applications