slowpoke 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5f0a6122b30b1ab9e451cb58a294368a13e9925
-  data.tar.gz: 9970da3afc5dab294ebdd817c6b412faebbc6577
+  metadata.gz: 7218b133076d867f936b395fe4a2c87166b6e227
+  data.tar.gz: 54be0d4d6b54765a6df112d6fbfce7bbc25e96f0
 SHA512:
-  metadata.gz: bcd4a2ff4292b535615947f440cbef41037a0aaa4e61d9f8d478158875172f76c79dff4f4bbba3751cba7c1e674918e150053520aab52864fc45ece66a6bcb44
-  data.tar.gz: cf6a6cf5030ce46c9a45dd661472865fd6af88844027ad2ab38c35e8988ad4fca4fd9d797e4bb545684a204cdd14782447b363748cc09b9c43e194485205b9a6
+  metadata.gz: 9e6ca9a708e66b232143d42416a18eff3579d0e939e4f90f944d0eede0fc4312a6c6118d7c0f3cd55818e14e376c861fa70cba3e0413387b91934ffba7d3fdba
+  data.tar.gz: aa743cb1419b9ed96d3a902f8ba5c26a205dfb201e976f4241a6d7ca32254bb82ffb8889260812a92e0a984f95874dbf83cfe07b8002f232c5335e6f0f7a6a38

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.2
+
+- Updated to latest version of rack-timeout, removing the need to bubble timeouts
+
 ## 0.1.1
 
 - Fixed safer service timeouts

data/lib/slowpoke/middleware.rb

@@ -5,7 +5,8 @@ module Slowpoke
     end
 
     def call(env)
-      response = @app.call(env)
+      @app.call(env)
+    ensure
       if env[Slowpoke::ENV_KEY]
         # extremely important
         # protect the process with a restart
@@ -17,7 +18,6 @@ module Slowpoke
           Process.kill("QUIT", Process.pid)
         end
       end
-      response
     end
   end
 end

data/lib/slowpoke/railtie.rb

@@ -3,9 +3,9 @@ module Slowpoke
     initializer "slowpoke" do |app|
       Rack::Timeout.timeout = Slowpoke.timeout
 
-      # prevent RequestExpiryError from killing web server
-      app.config.middleware.delete "Rack::Timeout"
       app.config.middleware.insert_before "ActionDispatch::RemoteIp", "Rack::Timeout"
+
+      # prevent RequestExpiryError from killing web server
       app.config.middleware.insert 0, Slowpoke::Middleware
     end
   end

data/lib/slowpoke/version.rb

@@ -1,3 +1,3 @@
 module Slowpoke
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/slowpoke.rb

@@ -1,7 +1,6 @@
 require "slowpoke/version"
-require "rack-timeout"
+require "rack/timeout/base"
 require "safely_block"
-require "slowpoke/controller"
 require "slowpoke/middleware"
 require "slowpoke/migration"
 require "slowpoke/railtie"
@@ -37,6 +36,3 @@ Rack::Timeout.register_state_change_observer(:slowpoke) do |env|
     ActiveSupport::Notifications.instrument("timeout.slowpoke", {})
   end
 end
-
-# bubble exceptions for error reporting libraries
-ActionController::Base.send(:include, Slowpoke::Controller)

data/slowpoke.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails"
-  spec.add_dependency "rack-timeout", ">= 0.1.0"
+  spec.add_dependency "rack-timeout", ">= 0.3.0"
   spec.add_dependency "safely_block"
 
   spec.add_development_dependency "bundler", "~> 1.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slowpoke
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: safely_block
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,6 @@ files:
 - lib/generators/slowpoke/install_generator.rb
 - lib/generators/slowpoke/templates/503.html
 - lib/slowpoke.rb
-- lib/slowpoke/controller.rb
 - lib/slowpoke/middleware.rb
 - lib/slowpoke/migration.rb
 - lib/slowpoke/railtie.rb
@@ -122,9 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Rack::Timeout is great. Slowpoke makes it better.
 test_files: []
-has_rdoc: 

data/lib/slowpoke/controller.rb

@@ -1,21 +0,0 @@
-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) && exception.original_exception.is_a?(Rack::Timeout::Error)
-        raise exception.original_exception
-      else
-        raise exception
-      end
-    end
-  end
-end