From 21165bd75ad4699b6941994ea9d6c1d328033367 Mon Sep 17 00:00:00 2001 From: rHorsey Date: Fri, 16 Jun 2017 18:03:49 -0600 Subject: [PATCH] A null from dos2unix causes the container to restart? --- server/app/workers/run_simulate_data_point.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/server/app/workers/run_simulate_data_point.rb b/server/app/workers/run_simulate_data_point.rb index c6c8ca12b..d9a5a298b 100644 --- a/server/app/workers/run_simulate_data_point.rb +++ b/server/app/workers/run_simulate_data_point.rb @@ -344,11 +344,13 @@ def initialize_worker # Run the server data_point initialization script with defined arguments, if it exists. Convert CRLF if required begin Timeout.timeout(600) do - exec("find #{analysis_dir}/scripts -type f -print0 | xargs -0 dos2unix") - files = Dir.glob("#{analysis_dir}/scripts/worker_initialization/*").select { |f| !f.match(/.*args$/) }.map { |f| File.basename(f) } - files.each do |f| - @sim_logger.info "Found data point initialization file #{f}." - run_file(analysis_dir, 'initialization', f) + if File.directory? File.join(analysis_dir, 'scripts') + exec("find #{analysis_dir}/scripts -type f -print0 | xargs -0 dos2unix") + files = Dir.glob("#{analysis_dir}/scripts/worker_initialization/*").select { |f| !f.match(/.*args$/) }.map { |f| File.basename(f) } + files.each do |f| + @sim_logger.info "Found data point initialization file #{f}." + run_file(analysis_dir, 'initialization', f) + end end end rescue => e