diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-10 22:00:55 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-10 22:00:55 +0200 |
| commit | 63560660062d552d6bbebec007154f0c639bf865 (patch) | |
| tree | 0ff7ee5c1a63815685e9640ca4a9ceafb7732178 /actionpack/lib/action_dispatch/middleware | |
| parent | 59e89facc2264322bcab59c9a8622380b62d4d40 (diff) | |
| parent | 61fc7a455099f179de88967f403f2038b9d3c821 (diff) | |
| download | rails-63560660062d552d6bbebec007154f0c639bf865.tar.gz rails-63560660062d552d6bbebec007154f0c639bf865.tar.bz2 rails-63560660062d552d6bbebec007154f0c639bf865.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/show_exceptions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb index 8a2d8cd077..0a6d2bfc8a 100644 --- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb +++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb @@ -135,7 +135,7 @@ module ActionDispatch ActiveSupport::Deprecation.silence do message = "\n#{exception.class} (#{exception.message}):\n" message << exception.annoted_source_code if exception.respond_to?(:annoted_source_code) - message << exception.backtrace.join("\n ") + message << " " << application_trace(exception).join("\n ") logger.fatal("#{message}\n\n") end end |