rack-timeout 0.6.0 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45a8b583f5c8ec73b0659348e53083fd449d1ae732c020c45ab3decfd4d7c913
-  data.tar.gz: 832b443cc5678f0c55df7a8c741dc2f5304e024da77f021ecbaa352c03279e51
+  metadata.gz: 9227dd3e15be49573b85cff836c363d2046d91167d7a3f5731f7002550912beb
+  data.tar.gz: 5454236eff00e74096e5d6818ff80fc0663d12d3f52848847e5fefb02d5110cd
 SHA512:
-  metadata.gz: 2279854e2ca96bc0fa0c9e6fe4a67a4d217f79df5840b59cf36b97518ddab7823a134c15fe1e527ce1a24972ee9113825bb58d52520accdcb7dc2a3d8147cb16
-  data.tar.gz: 00651f0c2e2449d490e88db4cf7d899f1287f22bc531fc4c22270024790635b552119572847de65a1933a5b7e4e6514c530a33b0689c02d6aeb34e73de392245
+  metadata.gz: fdb616f8274f70fffc7a0aef4c4ffc8bcadba8fd0968a58980e2027c3b7131aebf34f49c5d8cf7f69d871deccb27785dc671524501b7021a5f152314a62a4309
+  data.tar.gz: 0ce8bf83eb28973c064a56da114c32276dcc5961a5a761f46850c0e48d39170361f1dcb6ac483e1284bf703c819ba6c84a8b2c6329a207b03266b558e37b87d0

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## HEAD (unreleased)
+
+## 0.6.3
+
+- Fix `NoMethodError: undefined method 'logger' for Rails:Module` when Rails is defined as a Module, but is not a full Rails app (https://github.com/zombocom/rack-timeout/pull/180)
+
+## 0.6.2
+
+- Migrate CI from Travis CI to GitHub Actions (https://github.com/zombocom/rack-timeout/pull/182)
+- Rails 7+ support (https://github.com/zombocom/rack-timeout/pull/184)
+
+## 0.6.1
+
+- RACK_TIMEOUT_TERM_ON_TIMEOUT can be set to zero to disable (https://github.com/sharpstone/rack-timeout/pull/161)
+- Update the gemspec's homepage to the current repo URL(https://github.com/zombocom/rack-timeout/pull/183)
+
 ## 0.6.0
 
 - Allow sending SIGTERM to workers on timeout (https://github.com/sharpstone/rack-timeout/pull/157)

data/README.md

@@ -114,5 +114,5 @@ for Rails apps, Rails 3.x and up.
 
 
 ---
-Copyright © 2010-2016 Caio Chassot, released under the MIT license
-<http://github.com/heroku/rack-timeout>
+Copyright © 2010-2020 Caio Chassot, released under the MIT license
+<http://github.com/sharpstone/rack-timeout>

data/doc/settings.md

@@ -59,7 +59,7 @@ If your application timeouts fire frequently then [they can cause your applicati
 
 After the worker process exists will Puma's parent process know to boot a replacement worker. While one process is restarting, another can still serve requests (if you have more than 1 worker process per server/dyno). Between when a process exits and when a new process boots, there will be a reduction in throughput. If all processes are restarting, then incoming requests will be blocked while new processes boot.
 
-**How to enable** To enable this behavior you can set `term_on_timeout: 1` to an integer value. If you set it to zero or one, then the first time the process encounters a timeout, it will receive a SIGTERM.
+**How to enable** To enable this behavior you can set `term_on_timeout: 1` to an integer value. If you set it to one, then the first time the process encounters a timeout, it will receive a SIGTERM.
 
 To enable on Heroku run:
 

data/lib/rack/timeout/core.rb

@@ -53,8 +53,6 @@ module Rack
       when nil   ; read_timeout_property default, default
       when false ; false
       when 0     ; false
-      when String
-        read_timeout_property value.to_i, default
       else
         value.is_a?(Numeric) && value > 0 or raise ArgumentError, "value #{value.inspect} should be false, zero, or a positive number."
         value
@@ -69,7 +67,7 @@ module Rack
       :term_on_timeout
 
     def initialize(app, service_timeout:nil, wait_timeout:nil, wait_overtime:nil, service_past_wait:"not_specified", term_on_timeout: nil)
-      @term_on_timeout   = read_timeout_property term_on_timeout, ENV.fetch("RACK_TIMEOUT_TERM_ON_TIMEOUT", false)
+      @term_on_timeout   = read_timeout_property term_on_timeout, ENV.fetch("RACK_TIMEOUT_TERM_ON_TIMEOUT", 0).to_i
       @service_timeout   = read_timeout_property service_timeout, ENV.fetch("RACK_TIMEOUT_SERVICE_TIMEOUT", 15).to_i
       @wait_timeout      = read_timeout_property wait_timeout,    ENV.fetch("RACK_TIMEOUT_WAIT_TIMEOUT", 30).to_i
       @wait_overtime     = read_timeout_property wait_overtime,   ENV.fetch("RACK_TIMEOUT_WAIT_OVERTIME", 60).to_i
@@ -77,7 +75,6 @@ module Rack
 
       Thread.main['RACK_TIMEOUT_COUNT'] ||= 0
       if @term_on_timeout
-        raise "term_on_timeout must be an integer but is #{@term_on_timeout.class}: #{@term_on_timeout}" unless @term_on_timeout.is_a?(Numeric)
         raise "Current Runtime does not support processes" unless ::Process.respond_to?(:fork)
       end
       @app = app

data/lib/rack/timeout/logging-observer.rb

@@ -32,7 +32,7 @@ class Rack::Timeout::StateChangeLoggingObserver
 
   def logger(env = nil)
     @logger ||
-      (defined?(::Rails) && ::Rails.logger) ||
+      (defined?(::Rails) && ::Rails.respond_to?(:logger) && ::Rails.logger) ||
       (env && !env["rack.logger"].is_a?(::Rack::NullLogger) && env["rack.logger"]) ||
       (env && env["rack.errors"] && self.class.mk_logger(env["rack.errors"]))      ||
       (@fallback_logger ||= self.class.mk_logger($stderr))

data/lib/rack-timeout.rb

@@ -1,2 +1,2 @@
 require_relative "rack/timeout/base"
-require_relative "rack/timeout/rails" if defined?(Rails) && [3,4,5,6].include?(Rails::VERSION::MAJOR)
+require_relative "rack/timeout/rails" if defined?(Rails) && Rails::VERSION::MAJOR >= 3

data/test/test_helper.rb

@@ -15,7 +15,7 @@ class RackTimeoutTest < Test::Unit::TestCase
   def app
     settings = self.settings
     Rack::Builder.new do
-      use Rack::Timeout, settings
+      use Rack::Timeout, **settings
 
       map "/" do
         run lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['OK']] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-timeout
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.3
 platform: ruby
 authors:
 - Caio Chassot
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,15 +86,15 @@ files:
 - test/basic_test.rb
 - test/env_settings_test.rb
 - test/test_helper.rb
-homepage: https://github.com/sharpstone/rack-timeout
+homepage: https://github.com/zombocom/rack-timeout
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: https://github.com/sharpstone/rack-timeout/issues
-  changelog_uri: https://github.com/sharpstone/rack-timeout/blob/v0.6.0/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/rack-timeout/0.6.0/
-  source_code_uri: https://github.com/sharpstone/rack-timeout
-post_install_message: 
+  bug_tracker_uri: https://github.com/zombocom/rack-timeout/issues
+  changelog_uri: https://github.com/zombocom/rack-timeout/blob/v0.6.3/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/rack-timeout/0.6.3/
+  source_code_uri: https://github.com/zombocom/rack-timeout
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -109,8 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Abort requests that are taking too long
 test_files: