aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-09-27 20:18:55 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-09-27 20:18:55 +0000
commitfe0ffe406e831378a2864a706e9648b05023df1e (patch)
tree7028eea9b784eca22679fff32b14724605b3f5c4 /activesupport/lib
parent564077373daac93fb5fa895ab2550f2be6042da1 (diff)
downloadrails-fe0ffe406e831378a2864a706e9648b05023df1e.tar.gz
rails-fe0ffe406e831378a2864a706e9648b05023df1e.tar.bz2
rails-fe0ffe406e831378a2864a706e9648b05023df1e.zip
Ticket 2263 - Make clean logger compatible with both 1.8.2 and 1.8.3
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2369 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/clean_logger.rb13
1 files changed, 10 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/clean_logger.rb b/activesupport/lib/active_support/clean_logger.rb
index d0de1188f0..07162f1d44 100644
--- a/activesupport/lib/active_support/clean_logger.rb
+++ b/activesupport/lib/active_support/clean_logger.rb
@@ -10,7 +10,14 @@ class Logger #:nodoc:
end
private
- def format_message(severity, timestamp, msg, progname)
- "#{msg}\n"
+ # Ruby 1.8.3 swapped the format_message params.
+ if RUBY_VERSION < '1.8.3'
+ def format_message(severity, timestamp, msg, progname)
+ "#{msg}\n"
+ end
+ else
+ def format_message(severity, timestamp, progname, msg)
+ "#{msg}\n"
+ end
end
-end \ No newline at end of file
+end