logworm_amqp 0.9.7 → 0.9.8

data/CHANGELOG

@@ -1,10 +1,16 @@
+v0.9.8
+  - Set ip address to HTTP_X_REAL_IP if present --otherwise, it is set to Heroku's internal routing machine
+  - Moved the return statement outside of the ensure block --see
+        http://blog.leshill.org/blog/2009/11/17/ensure-with-explicit-return.html 
+    Thanks for Dave Brown @ Top Prospect for bringing the issue up
+  
 v0.9.7
   - lw_query now accepts a TTL parameter -- 300 seconds by default, can be lowered up to 20 seconds min
   - lw-compute now has a standard TTL of 60 seconds
   - no longer preserves entries from one request to the other --made more sense when there were timeouts, but with AMQP we don't 
     expect to see so many of them. Fixes bugs with log_with_request calls as well.
   - Adds a new optional field in the web_log table, :apache_log, a string with information about the HTTP request in 
-    the regular Apache Log format (requested by Dave Brwon @ Top Prospect)
+    the regular Apache Log format (requested by Dave Brown @ Top Prospect)
   
 v0.9.6
 	- Preserves the order of desired fields in a query. 

data/Rakefile

@@ -1,5 +1,5 @@
 require 'echoe'
-Echoe.new('logworm_amqp', '0.9.7') do |p|
+Echoe.new('logworm_amqp', '0.9.8') do |p|
   p.description = "logworm - logging service"
   p.url = "http://www.logworm.com"
   p.author = "Pomelo, LLC"

data/lib/client/rack.rb

@@ -24,16 +24,16 @@ module Logworm
         status, response_headers, body = @app.call(env) 
         appTime = (Time.now - startTime) 
       ensure
-        log_request(env, status, response_headers, appTime)
-        return [status, response_headers, body] 
+        log_request(env, status, response_headers, appTime || -1)
       end
+      return [status, response_headers, body] 
     end
     
     private 
     def log_request(env, status, response_headers, appTime)
       method       = env['REQUEST_METHOD']
       path         = env['PATH_INFO'] || env['REQUEST_PATH'] || "/"
-      ip           = env['REMOTE_ADDR']
+      ip           = env['HTTP_X_REAL_IP'] || env['REMOTE_ADDR']
       http_headers = env.reject {|k,v| !(k.to_s =~ /^HTTP/) }
       queue_size   = env['HTTP_X_HEROKU_QUEUE_DEPTH'].nil? ? -1 : env['HTTP_X_HEROKU_QUEUE_DEPTH'].to_i
 

data/lib/client/rails.rb

@@ -66,9 +66,9 @@ if defined?(ActionController) and Rails::VERSION::STRING and Rails::VERSION::STR
         response  = process_without_logworm_log(request, response, method, *arguments)
         appTime   = (Time.now - startTime) 
       ensure
-        log_request(request, response, appTime)
-        return response
+        log_request(request, response, appTime || -1)
       end
+      return response
     end
     alias_method_chain :process, :logworm_log
     
@@ -77,7 +77,7 @@ if defined?(ActionController) and Rails::VERSION::STRING and Rails::VERSION::STR
     def log_request(request, response, appTime)
       method       = request.env['REQUEST_METHOD']
       path         = request.path.blank? ? "/" : request.path
-      ip           = request.env['REMOTE_ADDR']
+      ip           = request.env['HTTP_X_REAL_IP'] || request.env['REMOTE_ADDR']
       http_headers = request.headers.reject {|k,v| !(k.to_s =~ /^HTTP/) }
       status       = response.status ? (response.status.is_a?(String) ? response.status[0..2].to_i : response.status.to_s.to_i) : -1
       queue_size   = request.env['HTTP_X_HEROKU_QUEUE_DEPTH'].blank? ? -1 : request.env['HTTP_X_HEROKU_QUEUE_DEPTH'].to_i

data/logworm_amqp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logworm_amqp}
-  s.version = "0.9.7"
+  s.version = "0.9.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pomelo, LLC"]
-  s.date = %q{2010-09-03}
+  s.date = %q{2010-09-29}
   s.description = %q{logworm - logging service}
   s.email = %q{schapira@pomelollc.com}
   s.executables = ["lw-compute", "lw-tail"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logworm_amqp
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - Pomelo, LLC
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 -04:00
+date: 2010-09-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency