diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-04-04 10:38:55 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-04-04 10:38:55 -0700 |
| commit | c6bd8a9d3ac2ebd5d0af4573d6d799085ac2219b (patch) | |
| tree | 196280214c5f9d459708afa7702546c6788893fd /activesupport/lib | |
| parent | f7a76aab5bf84fb368981c7247c23cce8447df9b (diff) | |
| parent | b16eb56280f704de0f1ea80f5ab850d9b17d70f8 (diff) | |
| download | rails-c6bd8a9d3ac2ebd5d0af4573d6d799085ac2219b.tar.gz rails-c6bd8a9d3ac2ebd5d0af4573d6d799085ac2219b.tar.bz2 rails-c6bd8a9d3ac2ebd5d0af4573d6d799085ac2219b.zip | |
Merge pull request #5188 from jlxw/patch-1
logger.silence is deprecated
Diffstat (limited to 'activesupport/lib')
| -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 |