#840: test 2
This commit is contained in:
parent
708a1741dc
commit
f6b0aa6a89
@ -22,7 +22,9 @@ class BootstrapWorker < Worker
|
|||||||
bootstrap_template: bootstrap_template
|
bootstrap_template: bootstrap_template
|
||||||
}
|
}
|
||||||
=end
|
=end
|
||||||
|
out << "\nFrom bootstrap worker: "
|
||||||
out << options.inspect
|
out << options.inspect
|
||||||
|
out << "\n"
|
||||||
executor = Devops::Executor::ServerExecutor.new(server, out)
|
executor = Devops::Executor::ServerExecutor.new(server, out)
|
||||||
executor.report = report
|
executor.report = report
|
||||||
status = executor.two_phase_bootstrap(options)
|
status = executor.two_phase_bootstrap(options)
|
||||||
|
|||||||
@ -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(convert_config(job_options))
|
jid = worker_class.perform_async(Worker.convert_config(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 = convert_config(job_options)
|
stringified_options = Worker.convert_config(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
|
||||||
@ -133,6 +133,7 @@ class Worker
|
|||||||
def self.convert_config conf
|
def self.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}"
|
||||||
config
|
config
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user