From 0a62b6ab4bae533dd294339eccd641f6d218aab4 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Wed, 9 Dec 2015 22:28:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=86=8D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squash from 1612a4d to 12f96c6 by virusdefender --- dockerfiles/judger/Dockerfile | 3 ++- oj/settings.py | 5 ----- tools/celeryd.conf | 15 --------------- tools/runserver.cmd | 5 ----- tools/runtest.cmd | 12 ------------ tools/supervisord.conf | 26 -------------------------- 6 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 tools/celeryd.conf delete mode 100644 tools/runserver.cmd delete mode 100644 tools/runtest.cmd delete mode 100644 tools/supervisord.conf diff --git a/dockerfiles/judger/Dockerfile b/dockerfiles/judger/Dockerfile index 6090728e..f13a9a5d 100644 --- a/dockerfiles/judger/Dockerfile +++ b/dockerfiles/judger/Dockerfile @@ -19,4 +19,5 @@ RUN cd lrun && make install RUN mkdir -p /var/judger/run/ && mkdir /var/judger/test_case/ && mkdir /var/judger/code/ RUN chmod -R 777 /var/judger/run/ COPY policy /var/judger/run/ -WORKDIR /var/judger/code/ \ No newline at end of file +WORKDIR /var/judger/code/judge/ +CMD python server.py \ No newline at end of file diff --git a/oj/settings.py b/oj/settings.py index 1d3cc378..ac766975 100644 --- a/oj/settings.py +++ b/oj/settings.py @@ -22,11 +22,6 @@ if ENV == "local": elif ENV == "server": from .server_settings import * -BROKER_BACKEND = "redis" -CELERY_ACCEPT_CONTENT = ['json'] -CELERY_TASK_SERIALIZER = 'json' -CELERY_RESULT_SERIALIZER = 'json' - BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) diff --git a/tools/celeryd.conf b/tools/celeryd.conf deleted file mode 100644 index 60e3fc21..00000000 --- a/tools/celeryd.conf +++ /dev/null @@ -1,15 +0,0 @@ -[program:celery] -command=celery worker -A judge.judger_controller --loglevel=DEBUG - -directory=/root/qduoj/ -user=root -numprocs=1 -stdout_logfile=/root/log/celery_worker.log -stderr_logfile=/root/log/celery_worker.log -autostart=true -autorestart=true -startsecs=5 - -stopwaitsecs = 6 - -killasgroup=true diff --git a/tools/runserver.cmd b/tools/runserver.cmd deleted file mode 100644 index b458e559..00000000 --- a/tools/runserver.cmd +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -python manage.py runserver -cls -cd.. -python manage.py runserver \ No newline at end of file diff --git a/tools/runtest.cmd b/tools/runtest.cmd deleted file mode 100644 index e6d9ad7b..00000000 --- a/tools/runtest.cmd +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -coverage run --source='.' manage.py test -coverage html -cd htmlcov -index.html -cls -cd.. -coverage run --source='.' manage.py test -coverage html -cd htmlcov -index.html - diff --git a/tools/supervisord.conf b/tools/supervisord.conf deleted file mode 100644 index 1494d7cd..00000000 --- a/tools/supervisord.conf +++ /dev/null @@ -1,26 +0,0 @@ -[unix_http_server] -file=/tmp/supervisor.sock ; path to your socket file - -[supervisord] -logfile=/root/log/supervisord.log ; supervisord log file -logfile_maxbytes=50MB ; maximum size of logfile before rotation -logfile_backups=10 ; number of backed up logfiles -loglevel=info ; info, debug, warn, trace -pidfile=/root/log/supervisord.pid ; pidfile location -nodaemon=false ; run supervisord as a daemon -minfds=1024 ; number of startup file descriptors -minprocs=200 ; number of process descriptors -user=root ; default user -childlogdir=/root/log/ ; where child log files will live - - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[supervisorctl] -serverurl=unix:///tmp/supervisor.sock ; use unix:// schem for a unix sockets. - - -[include] - -files=*.conf \ No newline at end of file