tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

#840: convert config in worker instance

Browse Source
This commit is contained in:
amartynov 2015-10-26 13:27:14 +03:00
parent f6b0aa6a89
commit 02e4ae88d8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devops-service/workers/bootstrap_worker.rb
View File

@ -12,6 +12,7 @@ class BootstrapWorker < Worker
server_attrs = options.fetch('server_attrs') server_attrs = options.fetch('server_attrs')
bootstrap_template = options.fetch('bootstrap_template') bootstrap_template = options.fetch('bootstrap_template')
owner = options.fetch('owner') owner = options.fetch('owner')
options = convert_config(options)
call(provider_name) do |provider, out, file| call(provider_name) do |provider, out, file|
server = Devops::Model::Server.new(server_attrs) server = Devops::Model::Server.new(server_attrs)

6
devops-service/workers/worker.rb
View File

@ -29,7 +29,7 @@ class Worker
end end
def self.start_async(worker_class, request, job_options) 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 Worker.set_status jid, Worker::STATUS::IN_QUEUE
DevopsLogger.logger.info "Job '#{jid}' has been queued" DevopsLogger.logger.info "Job '#{jid}' has been queued"
@ -39,7 +39,7 @@ class Worker
end end
def self.start_sync(worker_class, request, job_options, out) def self.start_sync(worker_class, request, job_options, out)
stringified_options = Worker.convert_config(job_options) stringified_options = job_options
=begin =begin
job_options.each do |key, value| job_options.each do |key, value|
stringified_options[key.to_s] = value stringified_options[key.to_s] = value
@ -130,7 +130,7 @@ class Worker
::Provider::ProviderFactory.get(provider_name) if provider_name ::Provider::ProviderFactory.get(provider_name) if provider_name
end end
def self.convert_config conf def convert_config conf
config = {} config = {}
conf.each {|k,v| config[k.is_a?(String) ? k.to_sym : k] = v} conf.each {|k,v| config[k.is_a?(String) ? k.to_sym : k] = v}
DevopsLogger.logger.info "Converted options: #{config.inspect}" DevopsLogger.logger.info "Converted options: #{config.inspect}"