diff --git a/devops-service/app/api2/handlers/deploy.rb b/devops-service/app/api2/handlers/deploy.rb index 600b337..da989ec 100644 --- a/devops-service/app/api2/handlers/deploy.rb +++ b/devops-service/app/api2/handlers/deploy.rb @@ -59,7 +59,8 @@ module Devops } Devops::Db.connector.save_report(Report.new(o)) end - files.push jid + uri.path = "#{DevopsConfig[:url_prefix]}/v2.0/report/" + jid + files.push uri.to_s end files end diff --git a/devops-service/app/api2/handlers/server.rb b/devops-service/app/api2/handlers/server.rb index 4a5a96a..dfe58ad 100644 --- a/devops-service/app/api2/handlers/server.rb +++ b/devops-service/app/api2/handlers/server.rb @@ -71,7 +71,7 @@ module Devops file = prepare_create_server do |project, env, user, body| jid = CreateServerWorker.perform_async(dir, body, user, DevopsConfig.config) 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.to_s end diff --git a/devops-service/app/api2/routes/deploy.rb b/devops-service/app/api2/routes/deploy.rb index 81955a7..11d16da 100644 --- a/devops-service/app/api2/routes/deploy.rb +++ b/devops-service/app/api2/routes/deploy.rb @@ -35,15 +35,10 @@ module Devops end end # stream else - ids = Devops::API2_0::Handler::Deploy.new(request).deploy() + files = Devops::API2_0::Handler::Deploy.new(request).deploy() sleep 1 - ids.each do |jid| - uri.path = "#{DevopsConfig.config[:url_prefix]}/v2.0/report/" + jid - files.push uri.to_s - end json files end - end app.get "/deploy/data/:project/:env" do |project, env|