[backend] waiting_job.msg is now always a ClientNewJob

UCL-INGI · Dec 17, 2021 · fc5c657 · fc5c657
1 parent 73d2309
commit fc5c657
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/inginious/backend/backend.py b/inginious/backend/backend.py
@@ -173,12 +173,8 @@ async def handle_client_get_queue(self, client_addr, _: ClientGetQueue):
 
         #jobs_waiting: a list of tuples in the form
         #(job_id, is_current_client_job, info, launcher, max_time)
-        jobs_waiting = list()
-
-        for job in self._waiting_jobs.values():
-            if isinstance(job.msg, ClientNewJob):
-                jobs_waiting.append((job.job_id, job.client_addr == client_addr, job.msg.course_id+"/"+job.msg.task_id, job.msg.launcher,
-                                     self._get_time_limit_estimate(job.msg)))
+        jobs_waiting = [(job.job_id, job.client_addr == client_addr, job.msg.course_id+"/"+job.msg.task_id, job.msg.launcher,
+                                     self._get_time_limit_estimate(job.msg)) for job in self._waiting_jobs.values()]
 
         await ZMQUtils.send_with_addr(self._client_socket, client_addr, BackendGetQueue(jobs_running, jobs_waiting))