tweaks to not use celery AsyncResult and EagerResult for task status

smartmin/csv_imports/migrations/0003_importtask_task_status.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('csv_imports', '0002_auto_20161118_1920'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='importtask',
+            name='task_status',
+            field=models.CharField(default='PENDING', max_length=32),
+        ),
+    ]

smartmin/csv_imports/models.py

@@ -19,6 +19,14 @@ def generate_file_path(instance, filename):
 
 
 class ImportTask(SmartModel):
+    PENDING = 'PENDING'
+    STARTED = 'STARTED'
+    RUNNING = 'RUNNING'
+    SUCCESS = 'SUCCESS'
+    FAILURE = 'FAILURE'
+
+    READY_STATES = [SUCCESS, FAILURE]
+
     csv_file = models.FileField(upload_to=generate_file_path, verbose_name="Import file",
                                 help_text="A comma delimited file of records to import")
 
@@ -32,31 +40,23 @@ class ImportTask(SmartModel):
 
     task_id = models.CharField(null=True, max_length=64)
 
+    task_status = models.CharField(max_length=32, default=PENDING)
+
     def start(self):
         from .tasks import csv_import
         self.log("Queued import at %s" % timezone.now())
-        self.save(update_fields=['import_log'])
+        self.task_status = self.STARTED
+        self.save(update_fields=['import_log', 'task_status'])
         result = csv_import.delay(self.pk)
         self.task_id = result.task_id
         self.save(update_fields=['task_id'])
 
     def done(self):
         if self.task_id:
-            if getattr(settings, 'CELERY_ALWAYS_EAGER', False):
-                result = EagerResult(self.task_id, None, 'SUCCESS')
-            else:
-                result = AsyncResult(self.task_id)
-            return result.ready()
+            return self.task_status in self.READY_STATES
 
     def status(self):
-        status = "PENDING"
-        if self.task_id:
-            if getattr(settings, 'CELERY_ALWAYS_EAGER', False):
-                result = EagerResult(self.task_id, None, 'SUCCESS')
-            else:
-                result = AsyncResult(self.task_id)
-            status = result.state
-        return status
+        return self.task_status
 
     def log(self, message):
         self.import_log += "%s\n" % message

smartmin/csv_imports/tasks.py

@@ -15,31 +15,36 @@
 
 @task(track_started=True)
 def csv_import(task_id):  # pragma: no cover
-    task = ImportTask.objects.get(pk=task_id)
+    task_obj = ImportTask.objects.get(pk=task_id)
     log = StringIO()
 
-    task.task_id = csv_import.request.id
-    task.log("Started import at %s" % timezone.now())
-    task.log("--------------------------------")
-    task.save()
+    task_obj.task_id = csv_import.request.id
+    task_obj.task_status = ImportTask.RUNNING
+    task_obj.log("Started import at %s" % timezone.now())
+    task_obj.log("--------------------------------")
+    task_obj.save()
 
     try:
         with transaction.atomic():
-            model = class_from_string(task.model_class)
-            records = model.import_csv(task, log)
-            task.save()
+            model = class_from_string(task_obj.model_class)
+            records = model.import_csv(task_obj, log)
+            task_obj.task_status = ImportTask.SUCCESS
+            task_obj.save()
 
-            task.log(log.getvalue())
-            task.log("Import finished at %s" % timezone.now())
-            task.log("%d record(s) added." % len(records))
+            task_obj.log(log.getvalue())
+            task_obj.log("Import finished at %s" % timezone.now())
+            task_obj.log("%d record(s) added." % len(records))
 
     except Exception as e:
         import traceback
         traceback.print_exc(e)
 
-        task.log("\nError: %s\n" % e)
-        task.log(log.getvalue())
+        task_obj.task_status = ImportTask.FAILURE
+
+        task_obj.log("\nError: %s\n" % e)
+        task_obj.log(log.getvalue())
+        task_obj.save()
 
         raise e
 
-    return task
+    return task_obj