From 0648d7a7b9d27de3673830aeec18057fbbe905db Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 26 Jul 2019 14:31:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AE=9E=E8=AE=AD=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/myshixuns_controller.rb | 2 +-
 app/controllers/shixuns_controller.rb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 6fe3e4be8..fa47fd7f6 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -42,7 +42,7 @@ class MyshixunsController < ApplicationController
       if e.message != "ActiveRecord::RecordInvalid"
         logger.error("######delete_repository_error:#{e.message}")
       end
-      raise ActiveRecord::Rollback
+      raise "delete_repository_error:#{e.message}"
     end
   end
 
diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 1999c473f..11016cfbb 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -718,7 +718,7 @@ class ShixunsController < ApplicationController
 					logger.error("##########project_fork error #{e.message}")
 					@current_task.destroy!
 				end
-				raise ActiveRecord::Rollback
+				raise "实训云平台繁忙（繁忙等级：81）"
 			end
 		end
 	end