diff options
| author | José Valim <jose.valim@gmail.com> | 2009-10-16 01:08:18 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-10-16 01:08:18 -0300 |
| commit | 9ba83cce0318fa5051764f4a16c286adf30169e2 (patch) | |
| tree | b1158e6916d69687c1b3e003aa97534a9135f460 /railties/lib/rails/commands/performance | |
| parent | 8b340ab2f62bac2af9d5917e296bb4101530282a (diff) | |
| parent | ef70ad5538c4ce02c4d31ef01a8db6b55c837571 (diff) | |
| download | rails-9ba83cce0318fa5051764f4a16c286adf30169e2.tar.gz rails-9ba83cce0318fa5051764f4a16c286adf30169e2.tar.bz2 rails-9ba83cce0318fa5051764f4a16c286adf30169e2.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/rails/commands/performance')
| -rw-r--r-- | railties/lib/rails/commands/performance/benchmarker.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/commands/performance/profiler.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/commands/performance/benchmarker.rb b/railties/lib/rails/commands/performance/benchmarker.rb index e8804fe1bf..5039c5408c 100644 --- a/railties/lib/rails/commands/performance/benchmarker.rb +++ b/railties/lib/rails/commands/performance/benchmarker.rb @@ -10,9 +10,9 @@ rescue ArgumentError N = 1 end -require RAILS_ROOT + '/config/environment' require 'benchmark' include Benchmark +Rails.application.new # Don't include compilation in the benchmark ARGV.each { |expression| eval(expression) } diff --git a/railties/lib/rails/commands/performance/profiler.rb b/railties/lib/rails/commands/performance/profiler.rb index 7df840f197..7274e2dfb7 100644 --- a/railties/lib/rails/commands/performance/profiler.rb +++ b/railties/lib/rails/commands/performance/profiler.rb @@ -5,7 +5,7 @@ end # Keep the expensive require out of the profile. $stderr.puts 'Loading Rails...' -require RAILS_ROOT + '/config/environment' +Rails.application.new # Initialize the application # Define a method to profile. if ARGV[1] and ARGV[1].to_i > 1 |