@@ -64,12 +64,15 @@ module Moonshine::Manifest::Rails::Rails :owner => configuration[:user], :group => configuration[:group] || configuration[:user], :mode => '775', - :content => ' ' + :content => ' ', + :backup => false, + :loglevel => :debug exec 'rake tasks', - :command => 'rake environment >> /var/log/moonshine_rake.log 2>&1', + :command => 'rake environment 2>&1 | tee -a /var/log/moonshine_rake.log', :user => configuration[:user], :cwd => rails_root, :environment => "RAILS_ENV=#{ENV['RAILS_ENV']}", + :logoutput => true, :require => [ exec('rails_gems'), package('rake'), @@ -226,11 +229,13 @@ private # app, with RAILS_ENV properly set def rake(name, options = {}) exec("rake #{name}", { - :command => "rake #{name} >> /var/log/moonshine_rake.log 2>&1", + :command => "rake #{name} 2>&1 | tee -a /var/log/moonshine_rake.log", :user => configuration[:user], :cwd => rails_root, :environment => "RAILS_ENV=#{ENV['RAILS_ENV']}", - :require => exec('rake tasks') + :require => exec('rake tasks'), + :logoutput => true, + :timeout => -1 }.merge(options) ) end lib/moonshine/manifest/rails/rails.rb @@ -48,11 +48,7 @@ namespace :moonshine do desc 'Apply the Moonshine manifest for this application' task :apply do - on_rollback do - run "cd #{latest_release} && RAILS_ENV=#{fetch(:rails_env, 'production')} rake --trace environment" - end sudo "RAILS_ROOT=#{latest_release} DEPLOY_STAGE=#{ENV['DEPLOY_STAGE']||fetch(:stage,'undefined')} RAILS_ENV=#{fetch(:rails_env, 'production')} shadow_puppet #{latest_release}/app/manifests/#{fetch(:moonshine_manifest, 'application_manifest')}.rb" - sudo "touch /var/log/moonshine_rake.log && cat /var/log/moonshine_rake.log" end desc "Update code and then run a console. Useful for debugging deployment." recipes/moonshine_cap.rb 3de25ade6a99d82d11cd99302fc8d1ac84f4fdea Jesse Newland jnewland@gmail.com http://github.com/railsmachine/moonshine/commit/a55eaae4ab4dac7a411929e0cea036c5da648e8f a55eaae4ab4dac7a411929e0cea036c5da648e8f 2009-11-02T18:43:23-08:00 2009-11-02T18:43:23-08:00 remove timeout and display output for all rake tasks 63e464afc02375fe0bdf808358aa5d364d7e8435 Jesse Newland jnewland@gmail.com