xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #79 : (virusdefender-dev -> dev)

Browse Source 
Merge Request: 去除对 subprocess 的依赖
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/79
This commit is contained in:
virusdefender
2015-08-15 17:52:26 +08:00
parent 4518257f9d 397927ef21
commit b4d70d8ebd
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
judge/judger_controller/tasks.py
View File

@@ -1,8 +1,8 @@
# coding=utf-8 # coding=utf-8
# from __future__ import absolute_import # from __future__ import absolute_import
import subprocess
import pymongo import pymongo
from bson import ObjectId from bson import ObjectId
import subprocess32 as subprocess
from ..judger.result import result from ..judger.result import result
from ..judger_controller.celery import app from ..judger_controller.celery import app
from settings import docker_config, source_code_dir, test_case_dir, celery_mongodb_config from settings import docker_config, source_code_dir, test_case_dir, celery_mongodb_config
@@ -22,7 +22,7 @@ def judge(submission_id, time_limit, memory_limit, test_case_id):
source_code_dir, source_code_dir,
docker_config["image_name"], docker_config["image_name"],
submission_id, str(time_limit), str(memory_limit), test_case_id) submission_id, str(time_limit), str(memory_limit), test_case_id)
subprocess.call(command, timeout=(time_limit / 1000.0 * 10), shell=docker_config["shell"]) subprocess.call(command, shell=docker_config["shell"])
except Exception as e: except Exception as e:
connection = pymongo.MongoClient(host=celery_mongodb_config["host"], port=celery_mongodb_config["port"]) connection = pymongo.MongoClient(host=celery_mongodb_config["host"], port=celery_mongodb_config["port"])
collection = connection["oj"]["oj_submission"] collection = connection["oj"]["oj_submission"]

1
requirements.txt
View File

@@ -7,5 +7,4 @@ django-rest-swagger
celery celery
gunicorn gunicorn
coverage coverage
subprocess32
pymongo pymongo