lib/foreman_tasks/dynflow/daemon.rb in foreman-tasks-0.7.1 vs lib/foreman_tasks/dynflow/daemon.rb in foreman-tasks-0.7.2
- old
+ new
@@ -22,10 +22,11 @@
# run the executor as a daemon
def run_background(command = "start", options = {})
default_options = { foreman_root: Dir.pwd,
process_name: 'dynflow_executor',
pid_dir: "#{Rails.root}/tmp/pids",
+ log_dir: File.join(Rails.root, 'log'),
wait_attempts: 300,
wait_sleep: 1 }
options = default_options.merge(options)
FileUtils.mkdir_p(options[:pid_dir])
begin
@@ -40,18 +41,20 @@
STDERR.puts("Dynflow Executor: #{command} in progress")
Daemons.run_proc(options[:process_name],
:dir => options[:pid_dir],
+ :log_dir => options[:log_dir],
:dir_mode => :normal,
:monitor => true,
:log_output => true,
:ARGV => [command]) do |*args|
begin
+ ::Logging.reopen
run(options[:foreman_root])
rescue => e
STDERR.puts e.message
- Rails.logger.fatal e
+ Foreman::Logging.exception("Failed running foreman-tasks daemon", e)
exit 1
end
end
end