slowpoke 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af786e335277355221963f452414cadd17d53fec
-  data.tar.gz: cfdce56d500d599f5d854bb68a44b86f03e6a4b1
+  metadata.gz: 536fd6527a9659642fa4aaad681b8eb617627db8
+  data.tar.gz: 969103107e61959e4eda5efdc975ae7d478b3b9c
 SHA512:
-  metadata.gz: b93df7d6d424bc941c37a7451cc6c63783cb9a390b08941907f1e8187f31a3a1c328d6e017e661c1b94fabb333260d2c0c0dbc6225e44b4bba78125fdd6d64c9
-  data.tar.gz: 7447ac2e09c6bd908b0ff9b81ef4ec28b0e73eb14a9ac201d94e85c7bb2dc39e85ac4860af73c358f52f7f5bfdabd4321a5c739108986a3ac683932979e74913
+  metadata.gz: 8aa007b642cc348e14613c0baedfd774373fbf2ae4b81ab4ae4b48e335d30d42dbc82644bb4475e34ae2e051d8fd5a9c5e70ad6b7b0c9cac6078911178f6f20b
+  data.tar.gz: 7c978167f493c0aef20ad9c3aaced4a0170480f2cb243da0257bf0c95569daf975bc39e0d64a73d752da7650432067a8316d4fff18405cced23bbb3b5dcdf55c

data/README.md

@@ -34,12 +34,6 @@ or use:
 ENV["TIMEOUT"] = 10
 ```
 
-For ActiveRecord (PostgreSQL only), change the database timeout with:
-
-```ruby
-Slowpoke.database_timeout = 5
-```
-
 Subscribe to timeouts
 
 ```ruby
@@ -48,6 +42,14 @@ ActiveSupport::Notifications.subscribe "timeout.slowpoke" do |name, start, finis
 end
 ```
 
+### Database Timeouts
+
+For ActiveRecord (PostgreSQL only), change the database timeout with:
+
+```ruby
+Slowpoke.database_timeout = 5
+```
+
 ## Contributing
 
 Everyone is encouraged to help improve this project. Here are a few ways you can help:

data/lib/slowpoke/controller.rb

@@ -0,0 +1,22 @@
+module Slowpoke
+  module Controller
+    extend ActiveSupport::Concern
+
+    included do
+      around_filter :bubble_timeout
+    end
+
+    private
+
+    def bubble_timeout
+      yield
+    rescue => exception
+      if exception.respond_to?(:original_exception) and exception.original_exception.is_a?(Rack::Timeout::Error)
+        raise exception.original_exception
+      else
+        raise exception
+      end
+    end
+
+  end
+end

data/lib/slowpoke/postgres.rb

@@ -0,0 +1,24 @@
+module Slowpoke
+  module Postgres
+    extend ActiveSupport::Concern
+
+    included do
+      alias_method_chain :configure_connection, :statement_timeout
+    end
+
+    def configure_connection_with_statement_timeout
+      configure_connection_without_statement_timeout
+      safely do
+        timeout = Slowpoke.database_timeout || Slowpoke.timeout
+        if ActiveRecord::Base.logger
+          ActiveRecord::Base.logger.silence do
+            execute("SET statement_timeout = #{timeout * 1000}")
+          end
+        else
+          execute("SET statement_timeout = #{timeout * 1000}")
+        end
+      end
+    end
+
+  end
+end

data/lib/slowpoke/version.rb

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

data/lib/slowpoke.rb

@@ -1,13 +1,16 @@
 require "slowpoke/version"
 require "rack-timeout"
 require "robustly"
+require "slowpoke/controller"
+require "slowpoke/postgres"
 require "slowpoke/railtie"
-require "action_view/template"
+require "action_dispatch/middleware/exception_wrapper"
 require "action_controller/base"
 require "active_record/connection_adapters/postgresql_adapter"
-require "action_dispatch/middleware/exception_wrapper"
 
 module Slowpoke
+  ENV_KEY = "slowpoke.timed_out"
+
   class << self
     attr_accessor :database_timeout
   end
@@ -17,59 +20,36 @@ module Slowpoke
   end
 
   def self.timeout=(timeout)
+    timeout = timeout.to_i if timeout
     @timeout = Rack::Timeout.timeout = timeout
   end
 end
 
-# remove noisy logger
-Rack::Timeout.unregister_state_change_observer(:logger)
-
+# custom error page
 ActionDispatch::ExceptionWrapper.rescue_responses["Rack::Timeout::RequestTimeoutError"] = :service_unavailable
 
-# hack to bubble timeout errors
-class ActionView::Template
-
-  def handle_render_error_with_timeout(view, e)
-    raise e if e.is_a?(Rack::Timeout::Error)
-    handle_render_error_without_timeout(view, e)
-  end
-  alias_method_chain :handle_render_error, :timeout
-
-end
+# remove noisy logger
+Rack::Timeout.unregister_state_change_observer(:logger)
 
-# notifications
-class ActionController::Base
+# process protection and notifications
+Rack::Timeout.register_state_change_observer(:slowpoke) do |env|
+  case env[Rack::Timeout::ENV_INFO_KEY].state
+  when :timed_out
+    env[Slowpoke::ENV_KEY] = true
 
-  def rescue_from_timeout(exception)
+    # TODO better payload
     ActiveSupport::Notifications.instrument("timeout.slowpoke", {})
-
+  when :completed
     # extremely important
     # protect the process with a restart
     # https://github.com/heroku/rack-timeout/issues/39
-    Process.kill "QUIT", Process.pid
-
-    raise exception
+    # can't do in timed_out state consistently
+    Process.kill("QUIT", Process.pid) if env[Slowpoke::ENV_KEY]
   end
-  rescue_from Rack::Timeout::Error, with: :rescue_from_timeout
-
 end
 
-# database timeout
-class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-
-  def configure_connection_with_statement_timeout
-    configure_connection_without_statement_timeout
-    safely do
-      timeout = Slowpoke.database_timeout || Slowpoke.timeout
-      if ActiveRecord::Base.logger
-        ActiveRecord::Base.logger.silence do
-          execute("SET statement_timeout = #{timeout * 1000}")
-        end
-      else
-        execute("SET statement_timeout = #{timeout * 1000}")
-      end
-    end
-  end
-  alias_method_chain :configure_connection, :statement_timeout
+# bubble exceptions for error reporting libraries
+ActionController::Base.send(:include, Slowpoke::Controller)
 
-end
+# database timeout
+ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:include, Slowpoke::Postgres)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slowpoke
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-timeout
@@ -81,6 +81,8 @@ files:
 - lib/generators/slowpoke/install_generator.rb
 - lib/generators/slowpoke/templates/503.html
 - lib/slowpoke.rb
+- lib/slowpoke/controller.rb
+- lib/slowpoke/postgres.rb
 - lib/slowpoke/railtie.rb
 - lib/slowpoke/version.rb
 - slowpoke.gemspec