diff --git a/judge/judger_controller/celery.py b/judge/judger_controller/celery.py index 6befedf9..5b90bdb9 100644 --- a/judge/judger_controller/celery.py +++ b/judge/judger_controller/celery.py @@ -3,8 +3,7 @@ from __future__ import absolute_import from celery import Celery from .settings import redis_config -app = Celery("judge", broker="redis://" + - redis_config["host"] + ":" + - str(redis_config["port"]) + - "/" + str(redis_config["db"]), +app = Celery("judge", broker='redis://%s:%s/%s' % (redis_config["host"], redis_config["port"], redis_config["db"]), include=["judge.judger_controller.tasks"]) + +Celery().conf.update(CELERY_ACCEPT_CONTENT = ['json']) \ No newline at end of file diff --git a/judge/judger_controller/settings.py b/judge/judger_controller/settings.py index 79648324..2c69d805 100644 --- a/judge/judger_controller/settings.py +++ b/judge/judger_controller/settings.py @@ -1,6 +1,6 @@ # coding=utf-8 redis_config = { - "host": "121.42.196.141", + "host": "121.42.32.129", "port": 6379, "db": 0 } diff --git a/oj/local_settings.py b/oj/local_settings.py index 7963e7a0..2d84f67e 100644 --- a/oj/local_settings.py +++ b/oj/local_settings.py @@ -18,7 +18,7 @@ DATABASES = { # 这是web 服务器连接到mongodb 的地址 MONGODB = { - 'HOST': '121.42.196.141', + 'HOST': '121.42.32.129', 'USERNAME': 'root', 'PASSWORD': 'root', 'PORT': 27017 diff --git a/static/src/js/app/oj/problem/problem.js b/static/src/js/app/oj/problem/problem.js index 8e107bb8..5b23c751 100644 --- a/static/src/js/app/oj/problem/problem.js +++ b/static/src/js/app/oj/problem/problem.js @@ -53,7 +53,14 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro return html; } + var counter = 0; + function getResult() { + if(counter++ > 10){ + hideLoading(); + bsAlert("抱歉，服务器可能出现了故障，请稍后到我的提交列表中查看"); + return; + } $.ajax({ url: "/api/submission/?submission_id=" + submissionId, method: "get", @@ -85,7 +92,7 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro showLoading(); if(!code.trim()){ - bs_alert("请填写代码！"); + bsAlert("请填写代码！"); hideLoading(); return false; } diff --git a/template/oj_base.html b/template/oj_base.html index fd8321b0..082cad5b 100644 --- a/template/oj_base.html +++ b/template/oj_base.html @@ -16,7 +16,7 @@ {% block css_block %}{% endblock %} - +{% load website_info %} @@ -38,7 +38,7 @@ - qduoj + {% show_website_info "website_name" %}