diff --git a/devops-service/workers/bootstrap_worker.rb b/devops-service/workers/bootstrap_worker.rb index eafc303..fe94b85 100644 --- a/devops-service/workers/bootstrap_worker.rb +++ b/devops-service/workers/bootstrap_worker.rb @@ -22,7 +22,9 @@ class BootstrapWorker < Worker bootstrap_template: bootstrap_template } =end +out << "\nFrom bootstrap worker: " out << options.inspect +out << "\n" executor = Devops::Executor::ServerExecutor.new(server, out) executor.report = report status = executor.two_phase_bootstrap(options) diff --git a/devops-service/workers/worker.rb b/devops-service/workers/worker.rb index 493babd..068d3d1 100644 --- a/devops-service/workers/worker.rb +++ b/devops-service/workers/worker.rb @@ -29,7 +29,7 @@ class Worker end def self.start_async(worker_class, request, job_options) - jid = worker_class.perform_async(convert_config(job_options)) + jid = worker_class.perform_async(Worker.convert_config(job_options)) Worker.set_status jid, Worker::STATUS::IN_QUEUE DevopsLogger.logger.info "Job '#{jid}' has been queued" @@ -39,7 +39,7 @@ class Worker end def self.start_sync(worker_class, request, job_options, out) - stringified_options = convert_config(job_options) + stringified_options = Worker.convert_config(job_options) =begin job_options.each do |key, value| stringified_options[key.to_s] = value @@ -133,6 +133,7 @@ class Worker def self.convert_config conf config = {} conf.each {|k,v| config[k.is_a?(String) ? k.to_sym : k] = v} + DevopsLogger.logger.info "Converted options: #{config.inspect}" config end