slowpoke 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e81989e90c4ba519f36f46021d180d1f2e5df40
-  data.tar.gz: ba0a6e166d707381fe6ebbaa8ddf8e8253f96eb9
+  metadata.gz: af786e335277355221963f452414cadd17d53fec
+  data.tar.gz: cfdce56d500d599f5d854bb68a44b86f03e6a4b1
 SHA512:
-  metadata.gz: 22e578b270ebbe71cb328b219d540463b34f21c6e4eb38095d0a56c2f7f18bd0e901d48e1a5d142eb6abd40f4468cda90f542a97117495588410127b06612d17
-  data.tar.gz: aea0511a75fbadb6e892e34f3a9cb1fee7f9c74999082f62106aaa9a6586375cf2629880bac0c4ec570c2e228d1d004bf1214f2542ff0248c1f1fdfbdaf58792
+  metadata.gz: b93df7d6d424bc941c37a7451cc6c63783cb9a390b08941907f1e8187f31a3a1c328d6e017e661c1b94fabb333260d2c0c0dbc6225e44b4bba78125fdd6d64c9
+  data.tar.gz: 7447ac2e09c6bd908b0ff9b81ef4ec28b0e73eb14a9ac201d94e85c7bb2dc39e85ac4860af73c358f52f7f5bfdabd4321a5c739108986a3ac683932979e74913

data/lib/slowpoke/railtie.rb

@@ -2,7 +2,8 @@ module Slowpoke
   class Railtie < Rails::Railtie
 
     initializer "slowpoke" do
-      Slowpoke.timeout = (ENV["TIMEOUT"] || 15).to_i
+      Rack::Timeout.timeout = Slowpoke.timeout
+      ActiveRecord::Base.logger.class.send(:include, ::LoggerSilence) if ActiveRecord::Base.logger
     end
 
   end

data/lib/slowpoke/version.rb

@@ -1,3 +1,3 @@
 module Slowpoke
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/slowpoke.rb

@@ -9,16 +9,19 @@ require "action_dispatch/middleware/exception_wrapper"
 
 module Slowpoke
   class << self
-    attr_reader :timeout
     attr_accessor :database_timeout
   end
 
+  def self.timeout
+    @timeout ||= (ENV["TIMEOUT"] || 15).to_i
+  end
+
   def self.timeout=(timeout)
-    @timeout = timeout
-    Rack::Timeout.timeout = timeout
+    @timeout = Rack::Timeout.timeout = timeout
   end
 end
 
+# remove noisy logger
 Rack::Timeout.unregister_state_change_observer(:logger)
 
 ActionDispatch::ExceptionWrapper.rescue_responses["Rack::Timeout::RequestTimeoutError"] = :service_unavailable
@@ -34,17 +37,24 @@ class ActionView::Template
 
 end
 
+# notifications
 class ActionController::Base
 
   def rescue_from_timeout(exception)
     ActiveSupport::Notifications.instrument("timeout.slowpoke", {})
+
+    # extremely important
+    # protect the process with a restart
+    # https://github.com/heroku/rack-timeout/issues/39
+    Process.kill "QUIT", Process.pid
+
     raise exception
   end
   rescue_from Rack::Timeout::Error, with: :rescue_from_timeout
 
 end
 
-# timeout queries after a minute
+# database timeout
 class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
 
   def configure_connection_with_statement_timeout
@@ -52,7 +62,6 @@ class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
     safely do
       timeout = Slowpoke.database_timeout || Slowpoke.timeout
       if ActiveRecord::Base.logger
-        ActiveRecord::Base.logger.class.send(:include, ::LoggerSilence)
         ActiveRecord::Base.logger.silence do
           execute("SET statement_timeout = #{timeout * 1000}")
         end

data/slowpoke.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rack-timeout", "= 0.1.0beta3"
+  spec.add_dependency "rack-timeout", ">= 0.1.0"
   spec.add_dependency "robustly"
 
   spec.add_development_dependency "bundler", "~> 1.7"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slowpoke
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Kane
@@ -14,16 +14,16 @@ dependencies:
   name: rack-timeout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0beta3
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0beta3
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: robustly
   requirement: !ruby/object:Gem::Requirement