Browse files

Merge branch 'master' of git@github.com:wycats/merb-more

  • Loading branch information...
2 parents bb6eb59 + 209c802 commit 450d0cfe957357ca0e2bc8d7c0b47c1c4569008e @booss booss committed Mar 16, 2008
View
5 merb-gen/app_generators/merb/templates/Rakefile
@@ -13,16 +13,15 @@ include FileUtils
# Load the basic runtime dependencies; this will include
# any plugins and therefore plugin rake tasks.
-init_env = ENV['MERB_ENV'] || 'development'
-log_file = Merb.log_path / 'rake.log'
+init_env = ENV['MERB_ENV'] || 'rake'
Merb.load_dependencies(:environment => init_env)
# Get Merb plugins and dependencies
Merb::Plugins.rakefiles.each { |r| require r }
desc "start runner environment"
task :merb_env do
- Merb.start_environment(:adapter => 'runner', :environment => init_env, :log_file => log_file)
+ Merb.start_environment(:environment => init_env, :adapter => 'runner')
end
##############################################################################
View
7 merb-gen/app_generators/merb/templates/config/environments/rake.rb
@@ -0,0 +1,7 @@
+Merb.logger.info("Loaded RAKE Environment...")
+Merb::Config.use { |c|
+ c[:exception_details] = true
+ c[:reload_classes] = false
+ c[:log_auto_flush ] = true
+ c[:log_file] = Merb.log_path / 'merb_rake.log'
+}

0 comments on commit 450d0cf

Please sign in to comment.