Skip to content

Commit af3a1f7

Browse files
committedFeb 9, 2022
use croner instead of node-schedule
1 parent cbf5c0a commit af3a1f7

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed
 

‎lib/Common.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -329,15 +329,14 @@ Common.retErr = function(e) {
329329
Common.sink = {};
330330

331331
Common.sink.determineCron = function(app) {
332-
const cronParser = require('cron-parser')
333-
const scheduleJob = require('node-schedule').scheduleJob;
334-
335332
if (app.cron_restart == 0 || app.cron_restart == '0') {
336333
Common.printOut(cst.PREFIX_MSG + 'disabling cron restart');
337334
return
338335
}
339336

340337
if (app.cron_restart) {
338+
const cronParser = require('cron-parser')
339+
341340
try {
342341
Common.printOut(cst.PREFIX_MSG + 'cron restart at ' + app.cron_restart);
343342
cronParser.parseExpression(app.cron_restart);

‎lib/Worker.js

+10-9
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
* Use of this source code is governed by a license that
44
* can be found in the LICENSE file.
55
*/
6-
var vizion = require('vizion');
7-
var cst = require('../constants.js');
8-
var eachLimit = require('async/eachLimit');
9-
var debug = require('debug')('pm2:worker');
10-
var domain = require('domain');
11-
const scheduleJob = require('node-schedule').scheduleJob;
6+
const vizion = require('vizion');
7+
const eachLimit = require('async/eachLimit');
8+
const debug = require('debug')('pm2:worker');
9+
const domain = require('domain');
10+
const Cron = require('croner');
11+
const pkg = require('../package.json');
12+
13+
var cst = require('../constants.js');
1214
var vCheck = require('./VersionCheck.js')
13-
var pkg = require('../package.json')
1415

1516
module.exports = function(God) {
1617
var timer = null;
@@ -34,7 +35,7 @@ module.exports = function(God) {
3435
var pm_id = pm2_env.pm_id
3536
console.log('[PM2][WORKER] Registering a cron job on:', pm_id);
3637

37-
var job = scheduleJob(pm2_env.cron_restart, function() {
38+
var job = Cron(pm2_env.cron_restart, function() {
3839
God.restartProcessId({id: pm_id}, function(err, data) {
3940
if (err)
4041
console.error(err.stack || err);
@@ -56,7 +57,7 @@ module.exports = function(God) {
5657
var job = God.CronJobs.get(God.getCronID(id));
5758

5859
if (job)
59-
job.cancel();
60+
job.stop();
6061

6162
God.CronJobs.delete(God.getCronID(id));
6263
};

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
"chokidar": "^3.5.1",
177177
"cli-tableau": "^2.0.0",
178178
"commander": "2.15.1",
179-
"node-schedule": "^2.0.0",
179+
"croner": "~4.1.92",
180180
"cron-parser": "~3.5.0",
181181
"dayjs": "~1.8.25",
182182
"debug": "^4.3.1",

0 commit comments

Comments
 (0)