Dequeue job awaiting execution when stop job is requested

Signed-off-by: Keshav Priyadarshi <git@keshav.space>

Author: keshav-space

vulnerabilities/models.py

@@ -2034,8 +2034,8 @@ def stop_run(self):
             return
 
         self.append_to_log("Stop run requested")
-        if not VULNERABLECODE_ASYNC:
-            self.set_run_stopped()
+        if self.status == self.Status.QUEUED:
+            self.dequeue()
             return
 
         if not self.job_status:
@@ -2085,6 +2085,11 @@ def append_to_log(self, message, is_multiline=False):
         self.log = self.log + message + "\n"
         self.save(update_fields=["log"])
 
+    def dequeue(self):
+        from vulnerabilities.tasks import dequeue_job
+
+        dequeue_job(self.run_id)
+
 
 class PipelineSchedule(models.Model):
     """The Database representation of a pipeline schedule."""

vulnerabilities/tasks.py

@@ -71,7 +71,7 @@ def legacy_runner(run_class, run):
     loggers = []
     for name in logger_modules:
         logger = logging.getLogger(name)
-        logger.setLevel(logging.DEBUG)
+        logger.setLevel(logging.INFO)
         logger.addHandler(handler)
         loggers.append(logger)
 
@@ -117,3 +117,9 @@ def enqueue_pipeline(pipeline_id):
         on_failure=set_run_failure,
         job_timeout=VULNERABLECODE_PIPELINE_TIMEOUT,
     )
+
+
+def dequeue_job(job_id):
+    """Remove a job from queue if it hasn't been executed yet."""
+    if job_id in queue.jobs:
+        queue.remove(job_id)