diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-04-04 10:38:55 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-04-04 14:40:44 -0300 |
| commit | 6663dd0969595786d2d2d94f05fc93642d103e18 (patch) | |
| tree | 5e894f7abbe90437548e321fb98cccf171e02bfd /activesupport | |
| parent | c4d31028f1c479c549b944610a52c2855d2e40e1 (diff) | |
| download | rails-6663dd0969595786d2d2d94f05fc93642d103e18.tar.gz rails-6663dd0969595786d2d2d94f05fc93642d103e18.tar.bz2 rails-6663dd0969595786d2d2d94f05fc93642d103e18.zip | |
Merge pull request #5188 from jlxw/patch-1
logger.silence is deprecated
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/benchmarkable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/benchmarkable.rb b/activesupport/lib/active_support/benchmarkable.rb index cc94041a1d..f149a7f0ed 100644 --- a/activesupport/lib/active_support/benchmarkable.rb +++ b/activesupport/lib/active_support/benchmarkable.rb @@ -35,7 +35,7 @@ module ActiveSupport options[:level] ||= :info result = nil - ms = Benchmark.ms { result = options[:silence] ? logger.silence { yield } : yield } + ms = Benchmark.ms { result = options[:silence] ? silence { yield } : yield } logger.send(options[:level], '%s (%.1fms)' % [ message, ms ]) result else |