From 27a275e21e9e699f775c744354a69716c51a2b9d Mon Sep 17 00:00:00 2001
From: yangdsh <dongshen@andrew.cmu.edu>
Date: Mon, 24 Feb 2020 18:40:52 +0000
Subject: [PATCH] detect celery failure

---
 server/website/website/views.py | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/server/website/website/views.py b/server/website/website/views.py
index de9d81b..9816686 100644
--- a/server/website/website/views.py
+++ b/server/website/website/views.py
@@ -1178,23 +1178,22 @@ def give_result(request, upload_code):  # pylint: disable=unused-argument
 
     response = dict(celery_status='', result_id=latest_result.pk, message='', errors=[])
 
-    if group_res.ready():
-        if group_res.failed():
-            errors = [t.traceback for t in task_list if t.traceback]
-            if errors:
-                LOG.warning('\n\n'.join(errors))
-            response.update(
-                celery_status='FAILURE', errors=errors,
-                message='Celery failed to get the next configuration')
-            status_code = 400
+    if group_res.failed():
+        errors = [t.traceback for t in task_list if t.traceback]
+        if errors:
+            LOG.warning('\n\n'.join(errors))
+        response.update(
+            celery_status='FAILURE', errors=errors,
+            message='Celery failed to get the next configuration')
+        status_code = 400
 
-        else:
-            assert group_res.successful()
-            next_config = JSONUtil.loads(next_config)
-            response.update(
-                next_config, celery_status='SUCCESS',
-                message='Celery successfully recommended the next configuration')
-            status_code = 200
+    elif group_res.ready():
+        assert group_res.successful()
+        next_config = JSONUtil.loads(next_config)
+        response.update(
+            next_config, celery_status='SUCCESS',
+            message='Celery successfully recommended the next configuration')
+        status_code = 200
 
     else:  # One or more tasks are still waiting to execute
         celery_status = 'PENDING'