修正dispatcher，使用redis存任务队列，修正submission的post，修改部分settings

submission/migrations/0002_auto_20170509_1203.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2017-05-09 12:03
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('submission', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='submission',
+            name='code',
+            field=models.TextField(),
+        ),
+    ]

submission/models.py

@@ -1,7 +1,6 @@
 from django.db import models
 from jsonfield import JSONField
 
-from utils.models import RichTextField
 from utils.shortcuts import rand_str
 
 
@@ -25,7 +24,7 @@ class Submission(models.Model):
     problem_id = models.IntegerField(db_index=True)
     created_time = models.DateTimeField(auto_now_add=True)
     user_id = models.IntegerField(db_index=True)
-    code = RichTextField()
+    code = models.TextField()
     result = models.IntegerField(default=JudgeStatus.PENDING)
     # 判题结果的详细信息
     info = JSONField(default={})

submission/tasks.py

@@ -1,7 +1,8 @@
+from __future__ import absolute_import, unicode_literals
 from celery import shared_task
-from judge.tasks import JudgeDispatcher
+from judge.dispatcher import JudgeDispatcher
 
 
 @shared_task
-def _judge(submission_obj, problem_obj):
-    return JudgeDispatcher(submission_obj, problem_obj).judge()
+def judge_task(submission_id, problem_id):
+    JudgeDispatcher(submission_id, problem_id).judge()

submission/views/oj.py

@@ -4,53 +4,43 @@ from django_redis import get_redis_connection
 from account.decorators import login_required
 from account.models import AdminType, User
 from problem.models import Problem
-
+from submission.tasks import judge_task
 from utils.api import APIView, validate_serializer
 from utils.shortcuts import build_query_string
 from utils.throttling import TokenBucket, BucketController
-
 from ..models import Submission
 from ..serializers import CreateSubmissionSerializer
-from ..tasks import _judge
-
-
-def _submit_code(response, user, problem_id, language, code):
-    controller = BucketController(user_id=user.id,
-                                  redis_conn=get_redis_connection("Throttling"),
-                                  default_capacity=30)
-    bucket = TokenBucket(fill_rate=10,
-                         capacity=20,
-                         last_capacity=controller.last_capacity,
-                         last_timestamp=controller.last_timestamp)
-    if bucket.consume():
-        controller.last_capacity -= 1
-    else:
-        return response.error("Please wait %d seconds" % int(bucket.expected_time() + 1))
-
-    try:
-        problem = Problem.objects.get(id=problem_id)
-    except Problem.DoesNotExist:
-        return response.error("Problem not exist")
-
-    submission = Submission.objects.create(user_id=user.id,
-                                           language=language,
-                                           code=code,
-                                           problem_id=problem.id)
-
-    try:
-        _judge.delay(submission, problem)
-    except Exception:
-        return response.error("Failed")
-
-    return response.success({"submission_id": submission.id})
 
 
 class SubmissionAPI(APIView):
     @validate_serializer(CreateSubmissionSerializer)
+    # TODO: login
     # @login_required
     def post(self, request):
+        controller = BucketController(user_id=request.user.id,
+                                      redis_conn=get_redis_connection("Throttling"),
+                                      default_capacity=30)
+        bucket = TokenBucket(fill_rate=10, capacity=20,
+                             last_capacity=controller.last_capacity,
+                             last_timestamp=controller.last_timestamp)
+        if bucket.consume():
+            controller.last_capacity -= 1
+        else:
+            return self.error("Please wait %d seconds" % int(bucket.expected_time() + 1))
+
         data = request.data
-        return _submit_code(self, request.user, data["problem_id"], data["language"], data["code"])
+        try:
+            problem = Problem.objects.get(id=data['problem_id'])
+        except Problem.DoesNotExist:
+            return self.error("Problem not exist")
+        # TODO: user_id
+        submission = Submission.objects.create(user_id=1,
+                                               language=data['language'],
+                                               code=data['code'],
+                                               problem_id=problem.id)
+        judge_task.delay(submission.id, problem.id)
+        # JudgeDispatcher(submission.id, problem.id).judge()
+        return self.success({"submission_id": submission.id})
 
     @login_required
     def get(self, request):