Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 2142

Show
Ignore:
Timestamp:
09/06/05 17:33:11 (3 years ago)
Author:
david
Message:

Fix fragment benchmark calls and limit timings to 5 decimals

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/lib/action_controller/benchmarking.rb

    r2141 r2142  
    2828          result = nil 
    2929          seconds = Benchmark.realtime { result = use_silence ? silence { yield } : yield } 
    30           logger.add(log_level, "#{title} (#{sprintf("%f", seconds)})") 
     30          logger.add(log_level, "#{title} (#{'%.5f' % seconds})") 
    3131          result 
    3232        else 

  • trunk/actionpack/lib/action_controller/caching.rb

    r2141 r2142  
    284284 
    285285        key = fragment_cache_key(name) 
    286         benchmark "Cached fragment: #{key}" do 
     286        self.class.benchmark "Cached fragment: #{key}" do 
    287287          fragment_cache_store.write(key, content, options) 
    288288        end 
    …… 
    295295 
    296296        key, cache = fragment_cache_key(name), nil 
    297         benchmark "Fragment hit: #{key}" do 
     297        self.class.benchmark "Fragment read: #{key}" do 
    298298          cache = fragment_cache_store.read(key, options) 
    299299        end 
    …… 
    312312 
    313313        if key.is_a?(Regexp) 
    314           benchmark "Expired fragments matching: #{key.source}" do 
     314          self.class.benchmark "Expired fragments matching: #{key.source}" do 
    315315            fragment_cache_store.delete_matched(key, options) 
    316316          end 
    317317        else 
    318           benchmark "Expired fragment: #{key}" do 
     318          self.class.benchmark "Expired fragment: #{key}" do 
    319319            fragment_cache_store.delete(key, options) 
    320320          end 

  • trunk/activerecord/lib/active_record/base.rb

    r2140 r2142  
    721721          result = nil 
    722722          seconds = Benchmark.realtime { result = use_silence ? silence { yield } : yield } 
    723           logger.info "#{title} (#{sprintf("%f", seconds)})" 
     723          logger.info "#{title} (#{'%.5f' % seconds)})" 
    724724          result 
    725725        else