right_support 2.9.2 → 2.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2215ed9e7706511edfcd6ea56abf45486749d9d
-  data.tar.gz: 15fac74e4fcb14b20b32f4de9a6087388bf3310b
+  metadata.gz: 37afc64ef433ebff859d8ceee0fb88c158609480
+  data.tar.gz: cee57ea2de6dca374c35df0337af297192d01176
 SHA512:
-  metadata.gz: 0bae6ef9d208192d1a73104c5f1178895ea3b27b09cbc09f84f017d2849c0f66a8b2c81959c52a3d7f0988575b77be9cd2065b2a3ab4d770852da45c9229de29
-  data.tar.gz: 4de8efb3cfd6d0c76c16875749fb681a3909c6ee6f6bf5fb1d3f7399c02039bdccfa547ea2460cbf824bc26ba6a99be51288ac609c7e2177e5ffa37590a70eea
+  metadata.gz: 27c7985c33dca1f7a28b811ea02849d93b1ecc53feecbb83e7e08594bb1008e1d31ca3a8d7f0910892235a4b01be62fd37342673ca2462e172f3dcb2321af6b0
+  data.tar.gz: 9a30f91c3411fa31619b67f24f6bd8611b7fc1e7fe28c2cb0f90e39bdbec6094624b6463ee519bd9e0e556775f6c32917449e58f9879beb76a11902660cdd4e5

data/VERSION

@@ -1 +1 @@
-2.9.2
+2.9.3

data/lib/right_support/rack/request_logger.rb

@@ -76,7 +76,7 @@ module RightSupport::Rack
       if env['sinatra.error'] && !env['sinatra.error.handled']
         log_exception(logger, env['sinatra.error'])
       end
-      log_request_end(logger, status, header, body, began_at) if enabled
+      log_request_end(logger, env, status, header, body, began_at) if enabled
 
       return [status, header, body]
     rescue Exception => e
@@ -117,8 +117,11 @@ module RightSupport::Rack
     #
     # @return [TrueClass] always true
     def log_request_begin(logger, env)
-      # Assuming remote addresses are IPv4, make them all align to the same width
-      remote_addr = env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-"
+      # Assuming remote addresses are IPv4, make them all align to the same
+      # width
+      remote_addr = env['HTP_X_REAL_IP'] ||
+                    env['HTTP_X_FORWARDED_FOR'] ||
+                    env["REMOTE_ADDR"] || "-"
       remote_addr = remote_addr.ljust(15)
 
       # If we're not logging the contents of the query string we only log the fact that a query
@@ -142,16 +145,16 @@ module RightSupport::Rack
       shard_info = 'Shard: ' + (env['HTTP_X_SHARD'] || 'default').to_s + ';'
 
       params = [
-        env["REQUEST_METHOD"],
-        env["PATH_INFO"],
+        env['REQUEST_METHOD'],
+        env['PATH_INFO'],
         query_info,
         remote_addr,
         sess,
         shard_info,
-        env["rack.request_uuid"] || ''
+        env['rack.request_uuid'] || ''
       ]
 
-      logger.info %Q{Processing %s "%s%s" (for %s)  %s %s Request ID: %s} % params
+      logger.info 'Processing %s "%s%s" (for %s)  %s %s Request ID: %s' % params
     end
 
     # Log end of request
@@ -162,7 +165,7 @@ module RightSupport::Rack
     # @param [Time] began_at time of the Rack request beginning
     #
     # @return [TrueClass] always true
-    def log_request_end(logger, status, headers, body, began_at)
+    def log_request_end(logger, env, status, headers, body, began_at)
       duration = (Time.now - began_at) * 1000
 
       # Downcase keys in the headers Hash for case-insensitive comparisons
@@ -184,9 +187,10 @@ module RightSupport::Rack
         duration,
         "#{status} #{Rack::Utils::HTTP_STATUS_CODES[status]}",
         content_length.to_s,
+        env['rack.request_uuid'] || ''
       ]
 
-      logger.info %Q{Completed in %dms | %s | %s bytes} % params
+      logger.info 'Completed in %dms | %s | %s bytes | Request ID: %s' % params
     end
 
     # Log exception

data/right_support.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: right_support 2.9.2 ruby lib
+# stub: right_support 2.9.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "right_support"
-  s.version = "2.9.2"
+  s.version = "2.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Tony Spataro", "Sergey Sergyenko", "Ryan Williamson", "Lee Kirchhoff", "Alexey Karpik", "Scott Messier"]
-  s.date = "2015-10-09"
+  s.date = "2015-11-02"
   s.description = "A toolkit of useful, reusable foundation code created by RightScale."
   s.email = "support@rightscale.com"
   s.extra_rdoc_files = [

data/spec/rack/request_logger_spec.rb

@@ -141,5 +141,21 @@ describe RightSupport::Rack::RequestLogger do
       end
     end
 
+    context 'request ID logging' do
+      before(:each) do
+        @logger = mock_logger
+        @env['rack.request_uuid'] = 'some-uuid'
+      end
+
+      it 'tags the Processing line' do
+        @logger.should_receive(:info).with(FlexMock.on { |arg| arg.should =~ /Request ID: some-uuid/ } )
+        @middleware.send(:log_request_begin, @logger, @env)
+      end
+
+      it 'tags the Completed line' do
+        @logger.should_receive(:info).with(FlexMock.on { |arg| arg.should =~ /Request ID: some-uuid/ } )
+        @middleware.send(:log_request_end, @logger, @env, 200, {}, '', Time.now)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_support
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.3
 platform: ruby
 authors:
 - Tony Spataro
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake