From fc49b0bbb618b3a040b100f1d7d8401f958dbb67 Mon Sep 17 00:00:00 2001
From: deepio <alex.daigle2@gmail.com>
Date: Sun, 11 Oct 2020 09:39:25 -0400
Subject: [PATCH] Update runjob.py

---
 rodan/models/runjob.py | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/rodan/models/runjob.py b/rodan/models/runjob.py
index 6d502de83..0a1ab1d98 100644
--- a/rodan/models/runjob.py
+++ b/rodan/models/runjob.py
@@ -1,16 +1,9 @@
-import logging
 import uuid
-
-from celery.task.control import revoke
 from django.db import models
-from django.contrib.auth.models import User
 from jsonfield import JSONField
-
-from rodan.constants import task_status
 from rodan.models.job import Job
-
-
-logger = logging.getLogger("rodan")
+from rodan.constants import task_status
+from django.contrib.auth.models import User
 
 
 class RunJob(models.Model):
@@ -142,8 +135,25 @@ def project(self):
         return self.workflow_run.project
 
     def delete(self):
+        from celery.task.control import revoke
+        import logging
+        from socket import error as socket_error
+        import errno
+
+        logger = logging.getLogger("rodan")
         logger.info("Killing Celery task_id: {}".format(self.celery_task_id))
 
         # https://docs.celeryproject.org/en/v4.3.0/reference/celery.app.control.html#celery.app.control.Control.revoke  # noqa
         # https://www.gnu.org/software/libc/manual/html_node/Termination-Signals.html
-        revoke(self.celery_task_id, terminate=True, signal="SIGTERM")
+        try:
+            revoke(self.celery_task_id, terminate=True, signal="SIGTERM")
+        except socket_error as serr:
+            # if serr.errno != errno.ECONNREFUSED:
+            if str(errno.ECONNREFUSED) not in repr(serr):
+                raise Exception(
+                    "Got: {} and not: {}\nRepr: {}".format(
+                        serr.errno,
+                        errno.ECONNREFUSED,
+                        repr(serr)
+                    )
+                )