Merge branch 'master' into notes

[rails.git] / config / initializers / buffered_logger.rb

diff --git a/config/initializers/buffered_logger.rb b/config/initializers/buffered_logger.rb
index 03d88f69c694d60fc5a3cb40a1d8517dee1d682f..c3a31b319a5cf18aa9bb2ee7105b9b6f81f6919b 100644 (file)
--- a/config/initializers/buffered_logger.rb
+++ b/config/initializers/buffered_logger.rb
@@ -4,10 +4,10 @@ module ActiveSupport
     alias_method :old_add, :add
 
     def add(severity, message = nil, progname = nil, &block)
     alias_method :old_add, :add
 
     def add(severity, message = nil, progname = nil, &block)

-      return if @level > severity
+      return if self.level > severity

       message = (message || (block && block.call) || progname).to_s
       time = Time.now
       message = (message || (block && block.call) || progname).to_s
       time = Time.now

-      message = "[%s.%06d #%d] %s\n" % [time.strftime("%Y-%m-%d %H:%M:%S"), time.usec, $$, message.sub(/^\n+/, "")]
+      message = "[%s.%06d #%d] %s" % [time.strftime("%Y-%m-%d %H:%M:%S"), time.usec, $$, message.sub(/^\n+/, "")]

       old_add(severity, message)
     end
   end
       old_add(severity, message)
     end
   end