rack-timeout 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84c611398a87d61130bbda91d3b98407a42b5906
-  data.tar.gz: 824bf643c7817f626c4a1f523b346b41a30ea97c
+  metadata.gz: 738562ce41045bc02a6cdf9ffb7333c6bdd73247
+  data.tar.gz: c665463483d072eda397c6ad9056d3ba2073f7ef
 SHA512:
-  metadata.gz: c9d4f5e73090c55c0656c1880a0cd36eda06e062bf24989fb6d9a8eba290ab708b6c8a66646864ba780e37b16b9f391a250b53bfa029834a409d2e29afe80ac0
-  data.tar.gz: 73b9e72dd731472638cbb330582b6b93bd958809de61167e41f3fb138f4559c147ad6cf79e1b1c36a9318e5017e07b1a45d47f2e8dfbb04724e436323cc6d94e
+  metadata.gz: ffefe99a1089a25cd504cd88e3dbc4bf4a834bf08b982ad97aa09057ba5e03871f38e5ed36bf65ba256a1f7456e429858ff6a796bee3a90069c9dc0e3dbb38c9
+  data.tar.gz: 1b6e1b54a34fa911e21bfdefefde66f3d74c75a590cb42642cf9bdc512bdb5558ef987815f7943edf069567fb7574f7c982ef87c09ca5fb28101c3ab4ef03742

data/lib/rack/timeout.rb

@@ -13,7 +13,11 @@ module Rack
       :service,   # time rack spent processing the request (updated ~ every second)
       :timeout,   # the actual computed timeout to be used for this request
       :state,     # the request's current state, see below:
-      )
+    ) {
+      def ms(k)   # helper method used for formatting values in milliseconds
+        '%.fms' % (self[k] * 1000) if self[k]
+      end
+    }
     VALID_STATES = [
       :expired,   # The request was too old by the time it reached rack (see wait_timeout, wait_overtime)
       :ready,     # We're about to start processing this request
@@ -99,7 +103,7 @@ module Rack
             sleep(sleep_seconds)
           end
           RT._set_state! env, :timed_out
-          app_thread.raise(RequestTimeoutError, "Request ran for longer than #{info.timeout} seconds.")
+          app_thread.raise(RequestTimeoutError, "Request #{"waited #{info.ms(:wait)} seconds, then " if info.wait}ran for longer than #{info.ms(:timeout)}")
         end
         response = @app.call(env)
       ensure

data/lib/rack/timeout/logger.rb

@@ -39,22 +39,17 @@ class Rack::Timeout
         (@fallback_logger ||= self.class.mk_logger($stderr))
     end
 
-    # helper method used for formatting in #log_state_change
-    def ms(s)
-      '%.fms' % (s * 1000)
-    end
-
     # generates the actual log string
     def log_state_change(env)
       info = env[ENV_INFO_KEY]
       level = STATE_LOG_LEVEL[info.state]
       logger(env).send(level) do
         s  = 'source=rack-timeout'
-        s << ' id='      << info.id          if info.id
-        s << ' wait='    << ms(info.wait)    if info.wait
-        s << ' timeout=' << ms(info.timeout) if info.timeout
-        s << ' service=' << ms(info.service) if info.service
-        s << ' state='   << info.state.to_s  if info.state
+        s << ' id='      << info.id           if info.id
+        s << ' wait='    << info.ms(:wait)    if info.wait
+        s << ' timeout=' << info.ms(:timeout) if info.timeout
+        s << ' service=' << info.ms(:service) if info.service
+        s << ' state='   << info.state.to_s   if info.state
         s
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-timeout
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Caio Chassot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies: []
 description: Rack middleware which aborts requests that have been running for longer
   than a specified timeout.