diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-10-15 14:50:02 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-10-15 14:54:12 -0700 |
| commit | 97296b11e2c4011ea5522c4de0153f7ffa6a47ae (patch) | |
| tree | c21e07dede9bb91108839ccafbbfa29f2e4838d7 /railties/lib/rails/commands/performance | |
| parent | e1490d4e4c60211173d51e7b21c16dbe4c2d942a (diff) | |
| download | rails-97296b11e2c4011ea5522c4de0153f7ffa6a47ae.tar.gz rails-97296b11e2c4011ea5522c4de0153f7ffa6a47ae.tar.bz2 rails-97296b11e2c4011ea5522c4de0153f7ffa6a47ae.zip | |
Have config/application.rb contain the application definition and require that file instead of config/boot.rb or config/environment.rb in script/*.
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 |