From 236102b6accc56a80df1e81b03429c043a8446c3 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Sun, 29 Nov 2015 01:24:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E9=A2=98=E7=BB=93=E6=9E=9C=E4=B8=AD?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=20server=20=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E4=BE=BF=E4=BA=8E=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- judge/runner.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/judge/runner.py b/judge/runner.py index 49b1ea9..4b5349e 100644 --- a/judge/runner.py +++ b/judge/runner.py @@ -1,5 +1,6 @@ # coding=utf-8 import os +import socket import shutil from client import JudgeClient @@ -15,7 +16,7 @@ class JudgeInstanceRunner(object): def run(self, submission_id, language_code, code, time_limit, memory_limit, test_case_id): language = languages[language_code] - + host_name = socket.gethostname() judge_base_path = os.path.join(judger_workspace, "run", submission_id) try: @@ -28,14 +29,14 @@ class JudgeInstanceRunner(object): f.close() except Exception as e: shutil.rmtree(judge_base_path, ignore_errors=True) - return {"code": 2, "data": str(e)} + return {"code": 2, "data": {"error": str(e), "server": host_name}} # 编译 try: exe_path = compile_(language, src_path, judge_base_path) except Exception as e: shutil.rmtree(judge_base_path, ignore_errors=True) - return {"code": 1, "data": str(e)} + return {"code": 1, "data": {"error": str(e), "server": host_name}} # 运行 try: @@ -45,7 +46,8 @@ class JudgeInstanceRunner(object): max_real_time=int(time_limit) * 2, max_memory=int(memory_limit), test_case_dir=judger_workspace + "test_case/" + test_case_id + "/") - judge_result = {"result": result["accepted"], "info": client.run(), "accepted_answer_time": None} + judge_result = {"result": result["accepted"], "info": client.run(), + "accepted_answer_time": None, "server": host_name} for item in judge_result["info"]: if item["result"]: @@ -56,6 +58,6 @@ class JudgeInstanceRunner(object): judge_result["accepted_answer_time"] = l[-1]["cpu_time"] return {"code": 0, "data": judge_result} except Exception as e: - return {"code": 2, "data": str(e)} + return {"code": 2, "data": {"error": str(e), "server": host_name}} finally: shutil.rmtree(judge_base_path, ignore_errors=True) \ No newline at end of file