fork/django-q2
1
0
Fork 0
mirror of https://github.com/django-q2/django-q2.git synced 2026-10-02 19:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

More refactoring

Browse Source
This commit is contained in:
GDay
2023-03-31 02:09:54 +02:00
parent a694a9f53c
commit e3517bd4c6
16 changed files with 715 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files
django_q/monitor.py
+40 -23
View File
@@ -1,5 +1,9 @@
from django_q.worker import WorkerProcess
from django_q.queue_task import QueueTask
from django_q.models import Task
from queue import Queue
from queue import Empty
from typing import Optional, Tuple
from django_q.brokers import get_broker
from django_q.process_manager import ProcessManager
from django_q.signals import post_execute
@@ -18,6 +22,24 @@ class Monitor(ProcessManager):
super().__init__()
self.task_queue = Queue()
@staticmethod
def save_task(task, broker=None) -> Tuple[QueueTask, Optional[Task]]:
task_db_obj = None
if broker is None:
broker = get_broker()
if task.cached:
task.save_cached(broker)
else:
print("SAVE TO DB")
task_db_obj = task.save_to_db(broker)
# acknowledge result
if task.ack_id and (task.has_succeeded or not task.ack_failure):
broker.acknowledge(task.ack_id)
# signal execution done
post_execute.send(sender="django_q", task=task)
return task, task_db_obj
@property
def is_done(self):
return self.status.value == self.Status.IDLE.value and self.task_queue.empty()
@@ -32,7 +54,11 @@ class Monitor(ProcessManager):
except Empty:
# if the queue is empty, then just stop
return
self.manager_pipe.send(task)
try:
self.manager_pipe.send(task)
except BrokenPipeError:
# recycle process if pipe is broken
self.status.value = ProcessManager.Status.RECYCLE.value
def add_task(self, task):
self.task_queue.put(task)
@@ -43,8 +69,8 @@ class Monitor(ProcessManager):
if setproctitle:
setproctitle.setproctitle(f"qcluster {proc_name} monitor")
logger.info(
_("%(name)s monitoring at %(id)s") % {"name": proc_name, "id": current_process().pid}
)
_("%(name)s monitoring at %(id)s") % {"name": proc_name, "id": current_process().pid}
)
status.value = self.Status.IDLE.value
while True:
@@ -54,32 +80,23 @@ class Monitor(ProcessManager):
break
status.value = self.Status.BUSY.value
# save the result
if task.cached:
task.save_cached(broker)
else:
task.save_to_db(broker)
# acknowledge result
if task.ack_id and (not task.has_succeeded or task.ack_failure):
broker.acknowledge(task.ack_id)
# signal execution done
post_execute.send(sender="django_q", task=task)
task, __ = Monitor.save_task(task, broker=broker)
# log the result
if task.has_succeeded:
# log success
logger.info(
_("Processed '%(info_name)s' (%(task_name)s)")
% {"info_name": task.func_name, "task_name": task.name}
)
_("Processed '%(info_name)s' (%(task_name)s)")
% {"info_name": task.func_name, "task_name": task.name}
)
else:
# log failure
logger.error(
_("Failed '%(info_name)s' (%(task_name)s) - %(task_result)s")
% {
"info_name": task.func_name,
"task_name": task.name,
"task_result": task.result_payload,
}
)
_("Failed '%(info_name)s' (%(task_name)s) - %(task_result)s")
% {
"info_name": task.func_name,
"task_name": task.name,
"task_result": task.result,
}
)
status.value = self.Status.IDLE.value
logger.info(_("%(name)s stopped monitoring results") % {"name": proc_name})