diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-11-16 14:26:28 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-11-16 14:26:28 -0500 |
| commit | 7830bb0d9d01b125755e226ffdca8a0f2cc7d00f (patch) | |
| tree | cc7a0d3a45341cb02197ae85e7b0b74acad4b5fd | |
| parent | 28dfc6a10b73f5dee2f6e13d5644b8aa7c5a938a (diff) | |
| parent | ff1902789d45190dd298b65342699d6043dd8ef2 (diff) | |
| download | rails-7830bb0d9d01b125755e226ffdca8a0f2cc7d00f.tar.gz rails-7830bb0d9d01b125755e226ffdca8a0f2cc7d00f.tar.bz2 rails-7830bb0d9d01b125755e226ffdca8a0f2cc7d00f.zip | |
Merge pull request #17639 from gsamokovarov/faster-exception-wrapper-traces
Don't double check trace origin in ExceptionWrapper#traces
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/exception_wrapper.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb index b8381aba70..edd98c5cf2 100644 --- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb +++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb @@ -65,8 +65,12 @@ module ActionDispatch full_trace.each_with_index do |trace, idx| trace_with_id = { id: idx, trace: trace } - appplication_trace_with_ids << trace_with_id if application_trace.include?(trace) - framework_trace_with_ids << trace_with_id if framework_trace.include?(trace) + if application_trace.include?(trace) + appplication_trace_with_ids << trace_with_id + else + framework_trace_with_ids << trace_with_id + end + full_trace_with_ids << trace_with_id end |