Skip to content

Commit

Permalink
add "-Dprecompiled=true" even if play_*_options is overridden
Browse files Browse the repository at this point in the history
  • Loading branch information
Yamashita Yuu committed Feb 9, 2012
1 parent b94cf4c commit 1d9ac91
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions conf/play-recipes.rb
Expand Up @@ -129,11 +129,11 @@
options = []
options << "-Xss2048k"
options << "--%prod"
options << "-Dprecompiled=true" if play_use_precompile
options
end
task :start, :roles => :app, :except => { :no_release => true } do
run "rm -f #{play_pid_file}" # FIXME: should check if the pid is active
play_start_options << "-Dprecompiled=true" if play_use_precompile
run "cd #{release_path} && nohup #{play_cmd} start --pid_file=#{play_pid_file} #{play_start_options.join(' ')}"
end

Expand Down Expand Up @@ -161,7 +161,8 @@
_cset :play_upstart_config_template, File.join(File.dirname(__FILE__), 'templates', 'upstart.erb')
_cset :play_upstart_options do
options = []
options << "-Dprecompiled=true" if play_use_precompile
options << "-Xss2048k"
options << "--%prod"
options
end
_cset :play_upstart_runner do
Expand All @@ -173,6 +174,7 @@
on_rollback {
run "rm -f #{tempfile}"
}
play_upstart_options << "-Dprecompiled=true" if play_use_precompile
template = File.read(play_upstart_config_template)
result = ERB.new(template).result(binding)
put result, tempfile
Expand Down

0 comments on commit 1d9ac91

Please sign in to comment.