each time to 10s

dev_shcool
huang 9 years ago
parent e766adf087
commit 191261d3b8

@ -33,7 +33,6 @@ class QualityAnalysisController < ApplicationController
arr = JSON.parse(projects_date).map {|m| m["nm"]} # eg: ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"] arr = JSON.parse(projects_date).map {|m| m["nm"]} # eg: ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
quality_an = QualityAnalysis.where(:sonar_name => sonar_name).first quality_an = QualityAnalysis.where(:sonar_name => sonar_name).first
if @client.job.exists?(job_name) && QualityAnalysis.where(:sonar_name => sonar_name).select{|qa| arr.include?(qa.sonar_name)}.blank? if @client.job.exists?(job_name) && QualityAnalysis.where(:sonar_name => sonar_name).select{|qa| arr.include?(qa.sonar_name)}.blank?
logger.info("88888888888888888888")
aa = @client.job.delete("#{job_name}") aa = @client.job.delete("#{job_name}")
quality_an.delete unless quality_an.blank? quality_an.delete unless quality_an.blank?
end end
@ -71,12 +70,12 @@ class QualityAnalysisController < ApplicationController
# 判断调用sonar分析是否成功 # 判断调用sonar分析是否成功
# 等待启动时间处理, 最长时间为30分钟 # 等待启动时间处理, 最长时间为30分钟
for i in 0..60 do for i in 0..180 do
sleep(30) sleep(10)
@current_build_status = @client.job.get_current_build_status("#{job_name}") @current_build_status = @client.job.get_current_build_status("#{job_name}")
if (@current_build_status == "success" || @current_build_status == "failure") if (@current_build_status == "success" || @current_build_status == "failure")
break break
if i == 60 if i == 180
@build_console_result = false @build_console_result = false
break break
end end

@ -6,6 +6,6 @@
<% if @build_console_result == false %> <% if @build_console_result == false %>
分析超时 分析超时
<% else %> <% else %>
<%= h @error_list.output %> <%= h @error_list.try(:output).html_safe %>
<% end %> <% end %>
</div> </div>
Loading…
Cancel
Save