fix cron check

Unitech · Feb 8, 2022 · 2673a97 · 2673a97
1 parent 540caab
commit 2673a97
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/lib/Common.js b/lib/Common.js
@@ -329,6 +329,7 @@ Common.retErr = function(e) {
 Common.sink = {};
 
 Common.sink.determineCron = function(app) {
+  const cronParser = require('cron-parser')
   const scheduleJob = require('node-schedule').scheduleJob;
 
   if (app.cron_restart == 0 || app.cron_restart == '0') {
@@ -339,9 +340,7 @@ Common.sink.determineCron = function(app) {
   if (app.cron_restart) {
     try {
       Common.printOut(cst.PREFIX_MSG + 'cron restart at ' + app.cron_restart);
-      scheduleJob(app.cron_restart, function() {
-        Common.printOut(cst.PREFIX_MSG + 'cron pattern for auto restart detected and valid');
-      });
+      cronParser.parseExpression(app.cron_restart);
     } catch(ex) {
       return new Error(`Cron pattern error: ${ex.message}`);
     }

diff --git a/lib/Worker.js b/lib/Worker.js
@@ -54,7 +54,10 @@ module.exports = function(God) {
       return;
     console.log('[PM2] Deregistering a cron job on:', id);
     var job = God.CronJobs.get(God.getCronID(id));
-    job.cancel();
+
+    if (job)
+      job.cancel();
+
     God.CronJobs.delete(God.getCronID(id));
   };
 

diff --git a/package.json b/package.json
@@ -177,6 +177,7 @@
     "cli-tableau": "^2.0.0",
     "commander": "2.15.1",
     "node-schedule": "^2.0.0",
+    "cron-parser": "~3.5.0",
     "dayjs": "~1.8.25",
     "debug": "^4.3.1",
     "enquirer": "2.3.6",