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

#840: test 2

Browse Source
This commit is contained in:
amartynov 2015-10-26 13:16:32 +03:00
parent 708a1741dc
commit f6b0aa6a89
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)

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

@ -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