From 43e8ec2d90a3f14b3da385bf679c3287f837ab71 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Mon, 7 Dec 2015 19:15:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20celery=20=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dockerfiles/oj_web_server/requirements.txt |  5 +++--
 oj/__init__.py                             |  5 -----
 oj/celery.py                               | 17 -----------------
 oj/local_settings.py                       |  9 +++++----
 oj/server_settings.py                      | 10 ++++++----
 oj/settings.py                             |  6 +-----
 runJudge.sh                                |  1 -
 7 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100644 oj/celery.py
 delete mode 100755 runJudge.sh

diff --git a/dockerfiles/oj_web_server/requirements.txt b/dockerfiles/oj_web_server/requirements.txt
index 7ad8718e..a0582be3 100644
--- a/dockerfiles/oj_web_server/requirements.txt
+++ b/dockerfiles/oj_web_server/requirements.txt
@@ -4,11 +4,12 @@ redis
 django-redis-sessions
 djangorestframework
 django-rest-swagger
-celery
 gunicorn
 coverage
 django-extensions
 supervisor
 pillow
 jsonfield
-Envelopes
\ No newline at end of file
+Envelopes
+rq
+django-rq
\ No newline at end of file
diff --git a/oj/__init__.py b/oj/__init__.py
index d22a8460..f4206374 100644
--- a/oj/__init__.py
+++ b/oj/__init__.py
@@ -7,8 +7,3 @@
                                                         |___/                |___/      |_|
 https://github.com/QingdaoU/OnlineJudge
 """
-from __future__ import absolute_import
-
-# This will make sure the app is always imported when
-# Django starts so that shared_task will use this app.
-from .celery import app as celery_app
diff --git a/oj/celery.py b/oj/celery.py
deleted file mode 100644
index 2f53c0ca..00000000
--- a/oj/celery.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from __future__ import absolute_import
-
-import os
-
-from celery import Celery
-
-# set the default Django settings module for the 'celery' program.
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'oj.settings')
-
-from django.conf import settings
-
-app = Celery('oj')
-
-# Using a string here means the worker will not have to
-# pickle the object when using Windows.
-app.config_from_object('django.conf:settings')
-app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
\ No newline at end of file
diff --git a/oj/local_settings.py b/oj/local_settings.py
index 965fd6b8..82bfe2ed 100644
--- a/oj/local_settings.py
+++ b/oj/local_settings.py
@@ -22,10 +22,11 @@ REDIS_CACHE = {
     "db": 1
 }
 
-# for celery
-REDIS_HOST = "localhost"
-REDIS_PORT = 6379
-REDIS_DB = 0
+REDIS_QUEUE = {
+    "host": "127.0.0.1",
+    "port": 6379,
+    "db": 2
+}
 
 DEBUG = True
 
diff --git a/oj/server_settings.py b/oj/server_settings.py
index f8942a92..cd86c16f 100644
--- a/oj/server_settings.py
+++ b/oj/server_settings.py
@@ -31,10 +31,12 @@ REDIS_CACHE = {
     "db": 1
 }
 
-# for celery
-REDIS_HOST = os.environ.get("REDIS_PORT_6379_TCP_ADDR", "127.0.0.1")
-REDIS_PORT = 6379
-REDIS_DB = 0
+REDIS_QUEUE = {
+    "host": os.environ.get("REDIS_PORT_6379_TCP_ADDR", "127.0.0.1"),
+    "port": 6379,
+    "db": 2
+}
+
 
 DEBUG = False
 
diff --git a/oj/settings.py b/oj/settings.py
index 54fefa71..65462e64 100644
--- a/oj/settings.py
+++ b/oj/settings.py
@@ -22,9 +22,6 @@ if ENV == "local":
 elif ENV == "server":
     from .server_settings import *
 
-import djcelery
-djcelery.setup_loader()
-
 BROKER_BACKEND = "redis"
 CELERY_ACCEPT_CONTENT = ['json']
 CELERY_TASK_SERIALIZER = 'json'
@@ -63,8 +60,7 @@ INSTALLED_APPS = (
     'judge_dispatcher',
 
     'django_extensions',
-    'rest_framework',
-    'djcelery',
+    'rest_framework'
 )
 
 if DEBUG:
diff --git a/runJudge.sh b/runJudge.sh
deleted file mode 100755
index ba25da83..00000000
--- a/runJudge.sh
+++ /dev/null
@@ -1 +0,0 @@
-nohup celery -A judge.judger_controller worker -l DEBUG &