diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-12-11 12:40:22 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-12-11 12:40:22 +0000 |
| commit | 9b98362cda013f85406ae8b26922264d382794dd (patch) | |
| tree | 9842eeee02a1e2b571e0008b18c5a8b390256224 /activeresource | |
| parent | ea12819adf5d5fa1e8ae07789478e18db887cda1 (diff) | |
| parent | 69387ce0169b95d3a170cfb1c66a7570b1746e37 (diff) | |
| download | rails-9b98362cda013f85406ae8b26922264d382794dd.tar.gz rails-9b98362cda013f85406ae8b26922264d382794dd.tar.bz2 rails-9b98362cda013f85406ae8b26922264d382794dd.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/doc/guides/html/activerecord_validations_callbacks.html
railties/doc/guides/source/activerecord_validations_callbacks.txt
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/lib/active_resource/connection.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb index 273fee3286..85103b53c5 100644 --- a/activeresource/lib/active_resource/connection.rb +++ b/activeresource/lib/active_resource/connection.rb @@ -146,8 +146,8 @@ module ActiveResource def request(method, path, *arguments) 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 "--> %d %s (%d %.2fs)" % [result.code, result.message, result.body ? result.body.length : 0, time] if logger + ms = Benchmark.ms { result = http.send(method, path, *arguments) } + logger.info "--> %d %s (%d %.0fms)" % [result.code, result.message, result.body ? result.body.length : 0, ms] if logger handle_response(result) rescue Timeout::Error => e raise TimeoutError.new(e.message) |