rack-instruments 0.1.3 → 0.1.4

data/lib/rack/instruments.rb

@@ -9,24 +9,20 @@ module Rack
     def call(env)
       request_id = UUIDTools::UUID.timestamp_create.to_s
       request_start = Time.now
-      Scrolls.log :instrumentation,
-        at:     "start",
-        method: env["REQUEST_METHOD"],
-        route:  env["REQUEST_PATH"],
-        ip:     env["REMOTE_ADDR"],
-        id:     request_id
+      status, headers, response = nil, nil, nil
 
+      # make ID of the request accessible to consumers down the stack
       env["REQUEST_ID"] = request_id
-      status, headers, response = @app.call(env)
 
-      Scrolls.log :instrumentation,
-        at:      "finish",
-        method:  env["REQUEST_METHOD"],
-        route:   env["REQUEST_PATH"],
-        ip:      env["REMOTE_ADDR"],
-        status:  status,
-        elapsed: "#{Integer((Time.now - request_start) * 1000)}ms",
-        id:      request_id
+      Scrolls.log(:instrumentation,
+        method: env["REQUEST_METHOD"],
+        path:   env["REQUEST_PATH"],
+        ip:     env["X-FORWARDED-FOR"] || env["HTTP_X_FORWARDED_FOR"] ||
+          env["REMOTE_ADDR"],
+        id:     request_id,
+        status: -> { status }) do
+          status, headers, response = @app.call(env)
+      end
 
       [status, headers, response]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-instruments
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000 Z
+date: 2012-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrolls-minimal