From afde6fdd5ef3e6b0693a7e330777e85ef4cffddb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 19 Oct 2011 12:59:33 -0500
Subject: Added X-Request-Id tracking and TaggedLogging to easily log that and
 other production concerns

---
 railties/lib/rails/rack/logger.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails/rack/logger.rb')

diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index 3be262de08..4d388c4d10 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -21,8 +21,8 @@ module Rails
         request = ActionDispatch::Request.new(env)
         path = request.filtered_path
 
-        info "\n\nStarted #{request.request_method} \"#{path}\" " \
-             "for #{request.ip} at #{Time.now.to_default_s}"
+        info "\n\n"
+        info "Started #{request.request_method} \"#{path}\" for #{request.ip} at #{Time.now.to_default_s}"
       end
 
       def after_dispatch(env)
-- 
cgit v1.2.3


From c83d9a11c00bc13e1f8f0fa0e8fb6185cacd5fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 19 Oct 2011 22:39:11 +0200
Subject: Unify logger and taggedlogging middleware as both address logging
 concerns.

---
 railties/lib/rails/rack/logger.rb | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

(limited to 'railties/lib/rails/rack/logger.rb')

diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index 4d388c4d10..89de10c83d 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -1,32 +1,46 @@
 require 'active_support/core_ext/time/conversions'
+require 'active_support/core_ext/object/blank'
 
 module Rails
   module Rack
     # Log the request started and flush all loggers after it.
     class Logger < ActiveSupport::LogSubscriber
-      def initialize(app)
-        @app = app
+      def initialize(app, tags=nil)
+        @app, @tags = app, tags.presence
       end
 
       def call(env)
-        before_dispatch(env)
-        @app.call(env)
-      ensure
-        after_dispatch(env)
+        if @tags
+          Rails.logger.tagged(compute_tags(env)) { call_app(env) }
+        else
+          call_app(env)
+        end
       end
 
     protected
 
-      def before_dispatch(env)
+      def call_app(env)
         request = ActionDispatch::Request.new(env)
         path = request.filtered_path
-
-        info "\n\n"
-        info "Started #{request.request_method} \"#{path}\" for #{request.ip} at #{Time.now.to_default_s}"
+        Rails.logger.info "\n\nStarted #{request.request_method} \"#{path}\" for #{request.ip} at #{Time.now.to_default_s}"
+        @app.call(env)
+      ensure
+        ActiveSupport::LogSubscriber.flush_all!
       end
 
-      def after_dispatch(env)
-        ActiveSupport::LogSubscriber.flush_all!
+      def compute_tags(env)
+        request = ActionDispatch::Request.new(env)
+
+        @tags.collect do |tag|
+          case tag
+          when Proc
+            tag.call(request)
+          when Symbol
+            request.send(tag)
+          else
+            tag
+          end
+        end
       end
     end
   end
-- 
cgit v1.2.3