Skip to content
Browse files

Merge pull request #11030 from mjtko/fix/backtrace-silencer-noise-wit…

…h-multiple-silencers

Fix BacktraceSilencer#noise when multiple silencers are configured
  • Loading branch information...
2 parents a29f746 + a3678e4 commit 3c0ef057f1af4d39379ba572139aa104c3673779 @drogus drogus committed Jun 20, 2013
View
7 activesupport/CHANGELOG.md
@@ -1,3 +1,10 @@
+* Fix return value from `BacktraceCleaner#noise` when the cleaner is configured
+ with multiple silencers.
+
+ Fixes #11030
+
+ *Mark J. Titorenko*
+
* `HashWithIndifferentAccess#select` now returns a `HashWithIndifferentAccess`
instance instead of a `Hash` instance.
View
6 activesupport/lib/active_support/backtrace_cleaner.rb
@@ -97,11 +97,7 @@ def silence(backtrace)
end
def noise(backtrace)
- @silencers.each do |s|
- backtrace = backtrace.select { |line| s.call(line) }
- end
-
- backtrace
+ backtrace - silence(backtrace)
end
end
end
View
21 activesupport/test/clean_backtrace_test.rb
@@ -36,6 +36,27 @@ def setup
end
end
+class BacktraceCleanerMultipleSilencersTest < ActiveSupport::TestCase
+ def setup
+ @bc = ActiveSupport::BacktraceCleaner.new
+ @bc.add_silencer { |line| line =~ /mongrel/ }
+ @bc.add_silencer { |line| line =~ /yolo/ }
+ end
+
+ test "backtrace should not contain lines that match the silencers" do
+ assert_equal \
+ [ "/other/class.rb" ],
+ @bc.clean([ "/mongrel/class.rb", "/other/class.rb", "/mongrel/stuff.rb", "/other/yolo.rb" ])
+ end
+
+ test "backtrace should only contain lines that match the silencers" do
+ assert_equal \
+ [ "/mongrel/class.rb", "/mongrel/stuff.rb", "/other/yolo.rb" ],
+ @bc.clean([ "/mongrel/class.rb", "/other/class.rb", "/mongrel/stuff.rb", "/other/yolo.rb" ],
+ :noise)
+ end
+end
+
class BacktraceCleanerFilterAndSilencerTest < ActiveSupport::TestCase
def setup
@bc = ActiveSupport::BacktraceCleaner.new

0 comments on commit 3c0ef05

Please sign in to comment.
Something went wrong with that request. Please try again.