From 47286ba744e683e86646365cb2fab322c65e446e Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sat, 20 Jul 2019 14:28:06 +0800 Subject: [PATCH 1/3] log --- app/controllers/shixuns_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 4b1d39245..5cf902e52 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -602,10 +602,10 @@ class ShixunsController < ApplicationController @current_task = myshixun.current_task(myshixun.games) uid_logger("## shixun exec: myshixun id is #{myshixun.id}") - rescue Exception => e - uid_logger_error(e.message) - tip_exception("实训云平台繁忙（繁忙等级：81）") - raise ActiveRecord::Rollback + # rescue Exception => e + # uid_logger_error(e.message) + # tip_exception("实训云平台繁忙（繁忙等级：81）") + # raise ActiveRecord::Rollback end end end From f91b193f45b5c269bb0449b184f9261337d8c621 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sat, 20 Jul 2019 14:34:34 +0800 Subject: [PATCH 2/3] log reset --- app/controllers/shixuns_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 9905d5f76..f5a2436c9 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -603,10 +603,10 @@ class ShixunsController < ApplicationController @current_task = myshixun.current_task(myshixun.games) uid_logger("## shixun exec: myshixun id is #{myshixun.id}") - # rescue Exception => e - # uid_logger_error(e.message) - # tip_exception("实训云平台繁忙（繁忙等级：81）") - # raise ActiveRecord::Rollback + rescue Exception => e + uid_logger_error(e.message) + tip_exception("实训云平台繁忙（繁忙等级：81）") + raise ActiveRecord::Rollback end end end From 0bf237a7ad3934757fa461bf275be24df7636e6d Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sat, 20 Jul 2019 14:39:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?vnc=E9=85=8D=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index ec69f3963..10b690d0c 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -69,7 +69,10 @@ class GamesController < ApplicationController if res && res['code'].to_i != 0 raise("实训云平台繁忙（繁忙等级：99）") end - @vnc_url = "http://#{service_host}:#{res['port']}/vnc_lite.html?password=headless" + # 无域名版本 + #@vnc_url = "http://#{service_host}:#{res['port']}/vnc_lite.html?password=headless" + # 有域名版本 + @vnc_url = "http://#{res['port']}.#{service_host}/vnc_lite.html?password=headless" rescue Exception => e Rails.logger.error(e.message) end