aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/lib/active_resource/connection.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-08-15 09:27:07 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-08-15 09:27:07 -0500
commitaad7cac6add2fa01cebbb36e9f546292d632c9ea (patch)
treeb4afc215d41692ec7dbe1766905d8c8fea451080 /activeresource/lib/active_resource/connection.rb
parent8aad8cb3906fce40fa583839fec7f8591fab8ec7 (diff)
downloadrails-aad7cac6add2fa01cebbb36e9f546292d632c9ea.tar.gz
rails-aad7cac6add2fa01cebbb36e9f546292d632c9ea.tar.bz2
rails-aad7cac6add2fa01cebbb36e9f546292d632c9ea.zip
Fixed problems with the logger used if the logging string included %'s [#840 state:resolved] (Jamis Buck)
Diffstat (limited to 'activeresource/lib/active_resource/connection.rb')
-rw-r--r--activeresource/lib/active_resource/connection.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb
index 0c4ea432d7..a4a61b61b5 100644
--- a/activeresource/lib/active_resource/connection.rb
+++ b/activeresource/lib/active_resource/connection.rb
@@ -140,7 +140,7 @@ module ActiveResource
logger.info "#{method.to_s.upcase} #{site.scheme}://#{site.host}:#{site.port}#{path}" if logger
result = nil
time = Benchmark.realtime { result = http.send(method, path, *arguments) }
- logger.info "--> #{result.code} #{result.message} (#{result.body ? result.body.length : 0}b %.2fs)" % time if logger
+ logger.info "--> %d %s (%d %.2fs)" % [result.code, result.message, result.body ? result.body.length : 0, time] if logger
handle_response(result)
rescue Timeout::Error => e
raise TimeoutError.new(e.message)