marcopolo 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d7b9c6170d11433cef35c60dc59c7381d465796
-  data.tar.gz: 79e60dc711051916638470ae3605c6d0a836acf5
+  metadata.gz: 023e1afa09c72d23e1e982318941a980e5ad841c
+  data.tar.gz: 725b1084a09540fd9996882f9acb324624853fd3
 SHA512:
-  metadata.gz: 5181e779ffab1fd41bc20f93e3815351c05c79b97a8024a6f661b7aada28ee832a9732382a50ec12e42246ab9283641a0a6503ce29264ec2e1ab410cb3e9cc69
-  data.tar.gz: 3dd424e72bfae1f83c6e6fa6746407becc7a56cba6d2cd57fa68847a3886a3720b2cfe02f2245d561c05a70897b074db3b0869112ad8536c782dae4ba3925923
+  metadata.gz: 2070d60fafe9cb7165d0ae92589ffed6f82210045aa34dfe4ddddb0b61de6377e45a6873fc48928514f3909aaa1e8c27475f9067612c7cadb0ad4af68cd43d5d
+  data.tar.gz: 572614652abe7cef657c9d13e56c79f3b92fe1832656bfe582926ceab36f994bca9dbf87ce3d7e33c084a55f43f5c275b1eb7683de7b2c21273e949456829291

data/README.md

@@ -36,6 +36,7 @@ You may want to filter out noisy requests, such as health checks. Create a proc
 
 ## TODO
 
+* Better log formatting!
 * Support for Sinatra?
 * Ability to disable for certain endpoints, etc
 * IP-based log segmenting?

data/lib/marcopolo/middleware.rb

@@ -15,11 +15,11 @@ module Marcopolo
         Marcopolo.log "Filtering request: #{@request.request_method} #{@request.url}"
       end
 
-      @status, @headers, @response = @app.call(env)
+      status, headers, response = @app.call(env)
 
-      rawlog_response(env) if allow
+      rawlog_response(status, headers, response) if allow
 
-      return [@status, @headers, @response]
+      return [status, headers, response]
     end
 
     def rawlog_request(env)
@@ -38,28 +38,32 @@ module Marcopolo
       req_headers.to_a.each {|i| req_hash["\t" + i.first] = i.last }
 
       req_hash.merge!({
-        "Request Body" => @request.body.gets
+        "Request Body" => @request.body.string
       })
 
       Marcopolo.log req_hash.to_a.map {|o| o.join(': ') }.join("\n") + "\n"
+    rescue => e
+      Marcopolo.log "Failed to log request: #{e}"
     end
 
-    def rawlog_response(env)
+    def rawlog_response(status, headers, response)
       resp_hash = {
         "RESPONSE" => "",
-        "Response Status" => @status,
+        "Response Status" => status,
         "Response Headers" => ""
       }
 
-      @headers.to_a.each {|i| resp_hash["\t" + i.first] = i.last }
+      headers.to_a.each {|i| resp_hash["\t" + i.first] = i.last }
 
-      response_body = @response.respond_to?(:body) ? @response.body : @response
+      response_body = response.respond_to?(:body) ? response.body : response
 
       resp_hash.merge!({
         "Response Body" => response_body
       })
 
       Marcopolo.log resp_hash.to_a.map {|o| o.join(': ') }.join("\n") + "\n"
+    rescue => e
+      Marcopolo.log "Failed to log response: #{e}"
     end
   end
 end

data/lib/marcopolo/version.rb

@@ -1,3 +1,3 @@
 module Marcopolo
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marcopolo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andrew Hammond
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler