From e6b26ee6cbec2fd196ad913224df0ce4d96ec030 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Thu, 15 Aug 2019 18:03:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=9C=A8=E5=86=B7=E5=8C=BA?=
 =?UTF-8?q?=E5=90=8E=E8=87=AA=E5=8A=A8=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/games_controller.rb | 63 ++++++++++++++---------------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 828198def..c7a598a43 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -498,44 +498,41 @@ class GamesController < ApplicationController
     rescue Exception => e
       # 思路： 异常首先应该考虑去恢复
       # retry为1表示已经轮训完成后还没有解决问题，这个时候需要检测异常
-      if params[:retry].to_i == 1
-        begin
-          # 如果模板没有问题，则通过中间层检测实训仓库是否异常
-          # 监测版本库HEAD是否存在，不存在则取最新的HEAD
-          gitUrl = repo_url @myshixun.repo_path
-          gitUrl = Base64.urlsafe_encode64(gitUrl)
-          shixun_tomcat = edu_setting('cloud_bridge')
-          rep_params = {:tpiID => "#{@myshixun.id}", :tpiGitURL  => "#{gitUrl}"}
-          # 监测版本库HEAD是否存在，不存在则取最新的HEAD
-          uri = "#{shixun_tomcat}/bridge/game/check"
-          res = uri_post uri, rep_params
-          uid_logger("repo_content to bridge: res is #{res}")
-          # res值：0 表示正常；-1表示有错误；-2表示代码版本库没了
-          #
-          if status == 0 && res
-            # 版本库报错，修复不了
-            if res['code'] == -1 || res['code'] == -2
-              begin
-                # GitService.delete_repository(repo_path: @myshixun.repo_path) if res['code'] == -1
-                project_fork(@myshixun, @shixun.repo_path, current_user.login)
-              rescue Exception => e
-                uid_logger_error("#{e.message}")
-                tip_exception("#{e.message}")
-              end
+      begin
+        # 如果模板没有问题，则通过中间层检测实训仓库是否异常
+        # 监测版本库HEAD是否存在，不存在则取最新的HEAD
+        gitUrl = repo_url @myshixun.repo_path
+        gitUrl = Base64.urlsafe_encode64(gitUrl)
+        shixun_tomcat = edu_setting('cloud_bridge')
+        rep_params = {:tpiID => "#{@myshixun.id}", :tpiGitURL  => "#{gitUrl}"}
+        # 监测版本库HEAD是否存在，不存在则取最新的HEAD
+        uri = "#{shixun_tomcat}/bridge/game/check"
+        res = uri_post uri, rep_params
+        uid_logger("repo_content to bridge: res is #{res}")
+        # res值：0 表示正常；-1表示有错误；-2表示代码版本库没了
+        #
+        if status == 0 && res
+          # 版本库报错，修复不了
+          if res['code'] == -1 || res['code'] == -2
+            begin
+              # GitService.delete_repository(repo_path: @myshixun.repo_path) if res['code'] == -1
+              project_fork(@myshixun, @shixun.repo_path, current_user.login)
+            rescue Exception => e
+              uid_logger_error("#{e.message}")
+              tip_exception("#{e.message}")
             end
           end
-        rescue Exception => e
-          uid_logger_error(e.message)
+        end
+      rescue Exception => e
+        uid_logger_error(e.message)
 
-          if @myshixun.shixun.try(:status) < 2
-            tip_exception("代码获取异常，请检查实训模板的评测设置是否正确")
-          else
-            # 报错继续retry
-            tip_exception(-3, "#{e.message}")
-          end
+        if @myshixun.shixun.try(:status) < 2
+          tip_exception("代码获取异常，请检查实训模板的评测设置是否正确")
+        else
+          # 报错继续retry
+          tip_exception(-3, "#{e.message}")
         end
       end
-      # 有异常，版本库获取不到代码，前端轮训15S后，调用retry == 1
       tip_exception(0, e.message)
     end
   end