psdev-task-manager 1.1.6 → 1.1.7

package/backend/tasks/taskManager.js

@@ -17,7 +17,7 @@ const {
 } = require('./utils');
 
 function taskManager() {
-  const processTask = (task, tasksConfig) =>
+  const processTaskWithDuration = (task, tasksConfig) =>
     withDuration(
       'processTask',
       async () => {
@@ -82,6 +82,10 @@ function taskManager() {
       },
       console
     );
+  const processTask = (...args) => {
+    const requestName = `processTask_${args[0].name}`; //To get success rate analysis per task
+    return withSuccessRateLogs(requestName, () => processTaskWithDuration(...args));
+  };
   /**
    * @description Processing tasks based on how many the cron job tick can handle and running them sequentially to be as safe as possible
    * */
@@ -136,10 +140,7 @@ function taskManager() {
   return {
     schedule: insertNewTask,
     scheduleInBulk: bulkInsertTasks,
-    processTask: (...args) => {
-      const requestName = `processTask_${args[0].name}`; //To get success rate analysis per task
-      return withSuccessRateLogs(requestName, () => processTask(...args));
-    },
+    processTask,
     runScheduledTasks: (...args) =>
       withDuration('runScheduledTasks', () => runScheduledTasks(...args), console),
   };

package/backend/tasks/utils.js

@@ -179,12 +179,14 @@ const filterScheduledTasksByStatus = (tasks, tasksConfig) => {
       //Only include parent tasks that are in progress, to continue running next children
       return isParentTask(task, taskConfig);
     }
-    if (status === TASK_STATUS.FAILED) {
-      // Exclude if it's a parent task, if parent task failed, we don't retry it anymore
-      return !isParentTask(task, taskConfig);
-    }
-    // Include if status is PENDING
-    return status === TASK_STATUS.PENDING;
+    //TODO: need to rethink of this as some parent tasks we use only to schedule children,
+    // if (status === TASK_STATUS.FAILED) {
+    //   // Exclude if it's a parent task, if parent task failed, we don't retry it anymore
+    //   return !isParentTask(task, taskConfig);
+    // }
+    // // Include if status is PENDING
+    // return status === TASK_STATUS.PENDING;
+    return [TASK_STATUS.PENDING, TASK_STATUS.FAILED].includes(task.status);
   };
   const filtered = tasks.filter(task => {
     const taskConfig = tasksConfig[task.name];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "psdev-task-manager",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "Task manager library",
   "keywords": [
     "task-manager"