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

fixed deploy command

Browse Source
This commit is contained in:
amartynov 2015-08-12 14:42:21 +03:00
parent f2dc365950
commit 0f83e3d9e6
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devops-service/app/api2/handlers/deploy.rb
View File

@ -59,7 +59,8 @@ module Devops
} }
Devops::Db.connector.save_report(Report.new(o)) Devops::Db.connector.save_report(Report.new(o))
end end
files.push jid uri.path = "#{DevopsConfig[:url_prefix]}/v2.0/report/" + jid
files.push uri.to_s
end end
files files
end end

2
devops-service/app/api2/handlers/server.rb
View File

@ -71,7 +71,7 @@ module Devops
file = prepare_create_server do |project, env, user, body| file = prepare_create_server do |project, env, user, body|
jid = CreateServerWorker.perform_async(dir, body, user, DevopsConfig.config) jid = CreateServerWorker.perform_async(dir, body, user, DevopsConfig.config)
Worker.set_status jid, Worker::STATUS::IN_QUEUE Worker.set_status jid, Worker::STATUS::IN_QUEUE
DevopsLogger.logger.info "Job '#{jid}' has been started" DevopsLogger.logger.info "Job '#{jid}' has been queued"
uri.path = "#{DevopsConfig[:url_prefix]}/v2.0/report/" + jid uri.path = "#{DevopsConfig[:url_prefix]}/v2.0/report/" + jid
uri.to_s uri.to_s
end end

7
devops-service/app/api2/routes/deploy.rb
View File

@ -35,15 +35,10 @@ module Devops
end end
end # stream end # stream
else else
ids = Devops::API2_0::Handler::Deploy.new(request).deploy() files = Devops::API2_0::Handler::Deploy.new(request).deploy()
sleep 1 sleep 1
ids.each do |jid|
uri.path = "#{DevopsConfig.config[:url_prefix]}/v2.0/report/" + jid
files.push uri.to_s
end
json files json files
end end
end end
app.get "/deploy/data/:project/:env" do |project, env| app.get "/deploy/data/:project/:env" do |project, env|