diff --git a/subtask.py b/subtask.py index 171d624..ff79a2c 100644 --- a/subtask.py +++ b/subtask.py @@ -258,11 +258,18 @@ class task_queuem(task): self.status = task_queuem_status.EXECUTING # 执行任务函数 elif self.status is task_queuem_status.EXECUTING: - logger.info(f"[TaskM]# Start execute task function") - self.task_now.exec() # 执行当前任务函数 - self.queue.task_done() # 弹出已执行的任务 - self.status = task_queuem_status.IDEL # - logger.info(f"[TaskM]# <<<<----------------------") + if self.task_now.enable is True: + logger.info(f"[TaskM]# Start execute task function") + self.task_now.exec() # 执行当前任务函数 + self.queue.task_done() # 弹出已执行的任务 + self.status = task_queuem_status.IDEL # + logger.info(f"[TaskM]# <<<<----------------------") + else: + logger.info(f"[TaskM]# Start execute task function (nexec)") + self.status = task_queuem_status.IDEL # 空动作不需要阻塞巡线,直接置位 + self.task_now.exec() # 执行当前任务函数 + self.queue.task_done() # 弹出已执行的任务 + logger.info(f"[TaskM]# <<<<----------------------") return True # 人员施救