Skip to content

Commit

Permalink
Make "nohup" non-default optional to address 9z0b3t1c#101
Browse files Browse the repository at this point in the history
The interaction between this gem and capistrano-rbenv causes problems in this configuration. Allowing "nohup" to be left out is a workaround. See 9z0b3t1c#101 for why this is so.
  • Loading branch information
zach committed Jul 6, 2015
1 parent 50a60ea commit 83d66bf
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/capistrano-resque/capistrano_integration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def start_command(queue, pid)
PIDFILE=#{pid} BACKGROUND=yes \
#{"VERBOSE=1 " if fetch(:resque_verbose)}\
INTERVAL=#{interval} \
nohup #{fetch(:bundle_cmd, "bundle")} exec rake \
#{fetch(:nohup_cmd, "")} #{fetch(:bundle_cmd, "bundle")} exec rake \
#{"environment " if fetch(:resque_environment_task)}\
resque:work #{output_redirection}"
end
Expand Down Expand Up @@ -82,7 +82,7 @@ def start_scheduler(pid)
#{"VERBOSE=1 " if fetch(:resque_verbose)}\
MUTE=1 \
#{"DYNAMIC_SCHEDULE=yes " if fetch(:resque_dynamic_schedule)}\
nohup #{fetch(:bundle_cmd, "bundle")} exec rake \
#{fetch(:nohup_cmd, "")} #{fetch(:bundle_cmd, "bundle")} exec rake \
#{"environment " if fetch(:resque_environment_task)}\
resque:scheduler #{output_redirection}"
end
Expand Down

0 comments on commit 83d66bf

Please sign in to comment.