diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2015-12-23 17:37:04 -0200 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2015-12-23 17:37:04 -0200 |
| commit | d6fe65a36d3b8f9943e38d70e7eba3e8ac28aed4 (patch) | |
| tree | 4561f7a11ead2ada27aa080709e619c60979d1cd /activerecord | |
| parent | 08724cc1549dbe6fa3c02ef030b89b106c91a51c (diff) | |
| parent | 629efb605728b31ad9644f6f0acaf3760b641a29 (diff) | |
| download | rails-d6fe65a36d3b8f9943e38d70e7eba3e8ac28aed4.tar.gz rails-d6fe65a36d3b8f9943e38d70e7eba3e8ac28aed4.tar.bz2 rails-d6fe65a36d3b8f9943e38d70e7eba3e8ac28aed4.zip | |
Merge pull request #20507 from rabbitt/bugfix/logger-threadsafety
Fixes LoggerSilence#silence threadsafety
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index f343a15317..ba3e16bdb2 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -1252,6 +1252,7 @@ class BasicsTest < ActiveRecord::TestCase original_logger = ActiveRecord::Base.logger log = StringIO.new ActiveRecord::Base.logger = ActiveSupport::Logger.new(log) + ActiveRecord::Base.logger.level = Logger::DEBUG ActiveRecord::Base.benchmark("Logging", :level => :debug, :silence => false) { ActiveRecord::Base.logger.debug "Quiet" } assert_match(/Quiet/, log.string) ensure |