aboutsummaryrefslogtreecommitdiffstats
path: root/actionwebservice/lib/action_web_service/dispatcher
diff options
context:
space:
mode:
authorLeon Breedt <bitserf@gmail.com>2005-02-25 02:24:36 +0000
committerLeon Breedt <bitserf@gmail.com>2005-02-25 02:24:36 +0000
commit7a5ff308eb5f45dcd8f7a25f6915e78f3b9528a0 (patch)
tree230d18046c290d839734209ee454585c9c874150 /actionwebservice/lib/action_web_service/dispatcher
parentb53f94d2bf7c04fb427344d6f7345f03b8b174e8 (diff)
downloadrails-7a5ff308eb5f45dcd8f7a25f6915e78f3b9528a0.tar.gz
rails-7a5ff308eb5f45dcd8f7a25f6915e78f3b9528a0.tar.bz2
rails-7a5ff308eb5f45dcd8f7a25f6915e78f3b9528a0.zip
handle elapsed times that are nil in #log_response (happens when API method
throws an exception). this fixes exception marshaling so that remote callers get a proper stack trace. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@798 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionwebservice/lib/action_web_service/dispatcher')
-rw-r--r--actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
index a8f34f2e33..511d00ca44 100644
--- a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
+++ b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
@@ -95,7 +95,7 @@ module ActionWebService # :nodoc:
def log_response(response, elapsed)
unless logger.nil? || response.nil?
- logger.debug("\nWeb Service Response (%f):" % elapsed)
+ logger.debug("\nWeb Service Response" + (elapsed ? " (%f):" % elapsed : ":"))
indented = response.raw_body.split(/\n/).map{|x| " #{x}"}.join("\n")
logger.debug(indented)
end