From aad7cac6add2fa01cebbb36e9f546292d632c9ea Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Fri, 15 Aug 2008 09:27:07 -0500
Subject: Fixed problems with the logger used if the logging string included
 %'s [#840 state:resolved] (Jamis Buck)

---
 activeresource/CHANGELOG                         | 2 ++
 activeresource/lib/active_resource/connection.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'activeresource')

diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
index 673e20de28..b62aa91b45 100644
--- a/activeresource/CHANGELOG
+++ b/activeresource/CHANGELOG
@@ -1,5 +1,7 @@
 *Edge*
 
+* Fixed problems with the logger used if the logging string included %'s [#840 state:resolved] (Jamis Buck)
+
 * Fixed Base#exists? to check status code as integer [#299 state:resolved] (Wes Oldenbeuving)
 
 
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)
-- 
cgit v1.2.3


From c1a8690d582c08777055caf449c03f85b4c8aa4b Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 18 Aug 2008 22:38:58 -0500
Subject: Consistently use the framework's configured logger and avoid
 reverting to RAILS_DEFAULT_LOGGER unless necessary.

---
 activeresource/lib/active_resource/connection.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'activeresource')

diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb
index a4a61b61b5..d64fb79f1e 100644
--- a/activeresource/lib/active_resource/connection.rb
+++ b/activeresource/lib/active_resource/connection.rb
@@ -28,24 +28,24 @@ module ActiveResource
 
   # 3xx Redirection
   class Redirection < ConnectionError # :nodoc:
-    def to_s; response['Location'] ? "#{super} => #{response['Location']}" : super; end    
-  end 
+    def to_s; response['Location'] ? "#{super} => #{response['Location']}" : super; end
+  end
 
   # 4xx Client Error
   class ClientError < ConnectionError; end # :nodoc:
-  
+
   # 400 Bad Request
   class BadRequest < ClientError; end # :nodoc
-  
+
   # 401 Unauthorized
   class UnauthorizedAccess < ClientError; end # :nodoc
-  
+
   # 403 Forbidden
   class ForbiddenAccess < ClientError; end # :nodoc
-  
+
   # 404 Not Found
   class ResourceNotFound < ClientError; end # :nodoc:
-  
+
   # 409 Conflict
   class ResourceConflict < ClientError; end # :nodoc:
 
@@ -201,7 +201,7 @@ module ActiveResource
       end
 
       def logger #:nodoc:
-        ActiveResource::Base.logger
+        Base.logger
       end
   end
 end
-- 
cgit v1.2.3