psdev-task-manager 1.1.1 → 1.1.4

package/backend/tasks/taskManager.js

@@ -1,4 +1,4 @@
-const { withDuration } = require('psdev-utils');
+const { withDuration, withSuccessRateLogs } = require('psdev-utils');
 
 const { TASK_STATUS, CRON_JOB_MAX_DURATION_SEC } = require('./consts');
 const { scheduleChildTasksAndUpdateParent } = require('./parentChildTasks/handler');
@@ -73,7 +73,11 @@ function taskManager() {
           if (saveResults) {
             await saveTaskResultToAdditionalCollection(task, TASK_STATUS.FAILED, { error });
           }
-          throw new Error(errMsg);
+          const isFailedAfterAllRetries = amountOfRetries >= TASK_MAX_TRIES;
+          if (isFailedAfterAllRetries) {
+            //Only throw error if task is permanently failed, otherwise we have retry mechanism
+            throw new Error(errMsg);
+          }
         }
       },
       console
@@ -132,7 +136,10 @@ function taskManager() {
   return {
     schedule: insertNewTask,
     scheduleInBulk: bulkInsertTasks,
-    processTask,
+    processTask : (...args) => {
+      const requestName = `processTask_${args[0].name}`; //To get success rate analysis per task
+      return withSuccessRateLogs(requestName, () => processTask(...args));
+    },
     runScheduledTasks: (...args) =>
       withDuration('runScheduledTasks', () => runScheduledTasks(...args), console),
   };

package/backend/tasks/utils.js

@@ -171,14 +171,26 @@ const filterScheduledTasksByStatus = (tasks, tasksConfig) => {
   console.log(
     `filterScheduledTasksByStatus: tasks count: ${tasks.length} tasksConfig: ${JSON.stringify(tasksConfig)}`
   );
-  const filtered = tasks.filter(task => {
-    if (task.status === TASK_STATUS.IN_PROGRESS) {
-      //Only include parent tasks that are in progress
-      console.log(`filterScheduledTasksByStatus: task: ${JSON.stringify(task)}`);
-      console.log(`filterScheduledTasksByStatus: tasksConfig: ${JSON.stringify(tasksConfig)}`);
+  const shouldIncludeTask = (task, tasksConfig) => {
+    console.log(`filterScheduledTasksByStatus: task: ${JSON.stringify(task)}`);
+    console.log(
+      `filterScheduledTasksByStatus: taskConfig: ${JSON.stringify(taskConfig)}`
+    );
+    const { status } = task;
+    if (status === TASK_STATUS.IN_PROGRESS) {
+      //Only include parent tasks that are in progress, to continue running next children
       return isParentTask(task, tasksConfig[task.name]);
     }
-    return [TASK_STATUS.PENDING, TASK_STATUS.FAILED].includes(task.status);
+    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;
+  };
+  const filtered = tasks.filter(task => {
+    const taskConfig = tasksConfig[task.name];
+    return shouldIncludeTask(task, taskConfig);
   });
   console.log(`filterScheduledTasksByStatus: filtered count: ${filtered.length}`);
   return filtered;

package/package.json

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