From 02e4ae88d8324df83da20876d7300c1af104e08a Mon Sep 17 00:00:00 2001 From: amartynov Date: Mon, 26 Oct 2015 13:27:14 +0300 Subject: [PATCH] #840: convert config in worker instance --- devops-service/workers/bootstrap_worker.rb | 1 + devops-service/workers/worker.rb | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/devops-service/workers/bootstrap_worker.rb b/devops-service/workers/bootstrap_worker.rb index fe94b85..b15f5ef 100644 --- a/devops-service/workers/bootstrap_worker.rb +++ b/devops-service/workers/bootstrap_worker.rb @@ -12,6 +12,7 @@ class BootstrapWorker < Worker server_attrs = options.fetch('server_attrs') bootstrap_template = options.fetch('bootstrap_template') owner = options.fetch('owner') + options = convert_config(options) call(provider_name) do |provider, out, file| server = Devops::Model::Server.new(server_attrs) diff --git a/devops-service/workers/worker.rb b/devops-service/workers/worker.rb index 068d3d1..53342a1 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(Worker.convert_config(job_options)) + jid = worker_class.perform_async(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 = Worker.convert_config(job_options) + stringified_options = job_options =begin job_options.each do |key, value| stringified_options[key.to_s] = value @@ -130,7 +130,7 @@ class Worker ::Provider::ProviderFactory.get(provider_name) if provider_name end - def self.convert_config conf + def 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}"