Skip to content

Node.js based forum software built for the modern web

fix: closes #14344, fix cron jobs

Barış Soner Uşaklıd23efb4e38bc
diff --git a/public/src/admin/settings/email.js b/public/src/admin/settings/email.js
index 937e17b906..0697b00440 100644
--- a/public/src/admin/settings/email.js
+++ b/public/src/admin/settings/email.js
@@ -1,7 +1,7 @@
'use strict';
-define('admin/settings/email', ['ace/ace', 'alerts', 'admin/settings'], function (ace, alerts) {
+define('admin/settings/email', ['ace/ace', 'alerts', 'admin/settings', 'hooks'], function (ace, alerts, hooks) {
const Email = {};
let emailEditor;
@@ -11,10 +11,8 @@ define('admin/settings/email', ['ace/ace', 'alerts', 'admin/settings'], function
configureEmailEditor();
handleDigestHourChange();
- $(window).off('action:admin.settingsLoaded', onSettingsLoaded)
- .on('action:admin.settingsLoaded', onSettingsLoaded);
- $(window).off('action:admin.settingsSaved', onSettingsSaved)
- .on('action:admin.settingsSaved', onSettingsSaved);
+ hooks.onPage('action:admin.settingsLoaded', onSettingsLoaded);
+ hooks.onPage('action:admin.settingsSaved', onSettingsSaved);
};
function onSettingsLoaded() {
diff --git a/src/cron.js b/src/cron.js
index c3165578dc..4dc1896f94 100644
--- a/src/cron.js
+++ b/src/cron.js
@@ -72,6 +72,22 @@ exports.addJob = async function (options) {
return job;
};
+exports.hasJob = function (name) {
+ return Object.hasOwn(jobs, name);
+};
+
+exports.restartJob = async function (options) {
+ exports.removeJob(options.name);
+ return await exports.addJob(options);
+};
+
+exports.removeJob = function (name) {
+ if (Object.hasOwn(jobs, name)) {
+ jobs[name].stop();
+ delete jobs[name];
+ }
+};
+
exports.getJobs = async function () {
const jobNames = await db.getSortedSetRange('cronJobs', 0, -1);
const jobs = await db.getObjects(jobNames.map(name => `cronJob:${name}`));
diff --git a/src/user/jobs.js b/src/user/jobs.js
index 2688ba0809..75b5f58b40 100644
--- a/src/user/jobs.js
+++ b/src/user/jobs.js
@@ -5,8 +5,6 @@ const db = require('../database');
const meta = require('../meta');
const cron = require('../cron');
-const jobs = {};
-
module.exports = function (User) {
User.startJobs = async function () {
winston.verbose('[user/jobs] (Re-)starting jobs...');
@@ -20,29 +18,31 @@ module.exports = function (User) {
digestHour = 0;
}
- User.stopJobs();
-
- await startDigestJob('digest.daily', `0 ${digestHour} * * *`, 'day');
- await startDigestJob('digest.weekly', `0 ${digestHour} * * 0`, 'week');
- await startDigestJob('digest.monthly', `0 ${digestHour} 1 * *`, 'month');
+ await restartDigestJob('digest.daily', `0 ${digestHour} * * *`, 'day');
+ await restartDigestJob('digest.weekly', `0 ${digestHour} * * 0`, 'week');
+ await restartDigestJob('digest.monthly', `0 ${digestHour} 1 * *`, 'month');
- jobs['reset.clean'] = await cron.addJob({
- name: 'user:reset:clean',
- cronTime: '0 0 * * *',
- onTick: User.reset.clean,
- });
+ if (!cron.hasJob('user:reset:clean')) {
+ await cron.addJob({
+ name: 'user:reset:clean',
+ cronTime: '0 0 * * *',
+ onTick: User.reset.clean,
+ });
+ }
- await cron.addJob({
- name: 'user:autoApprove',
- cronTime: '0 * * * *',
- onTick: User.autoApprove,
- });
+ if (!cron.hasJob('user:autoApprove')) {
+ await cron.addJob({
+ name: 'user:autoApprove',
+ cronTime: '0 * * * *',
+ onTick: User.autoApprove,
+ });
+ }
winston.verbose(`[user/jobs] jobs started`);
};
- async function startDigestJob(name, cronString, term) {
- const newJob = await cron.addJob({
+ async function restartDigestJob(name, cronString, term) {
+ await cron.restartJob({
name,
cronTime: cronString,
onTick: async () => {
@@ -56,25 +56,5 @@ module.exports = function (User) {
await User.digest.execute({ interval: term });
},
});
- if (newJob) {
- jobs[name] = newJob;
- }
}
-
- User.stopJobs = function () {
- let terminated = 0;
- // Terminate any active cron jobs
- for (const [name, job] of Object.entries(jobs)) {
- winston.info(`[user/jobs] Terminating job (${name})`);
- if (job) {
- job.stop();
- delete jobs[name];
- }
-
- terminated += 1;
- }
- if (terminated > 0) {
- winston.info(`[user/jobs] ${terminated} jobs terminated`);
- }
- };
};
diff --git a/test/user.js b/test/user.js
index 49f4d73b88..0f25c68163 100644
--- a/test/user.js
+++ b/test/user.js
@@ -2342,10 +2342,6 @@ describe('User', () => {
await User.startJobs();
});
- it('should stop user jobs', async () => {
- User.stopJobs();
- });
-
it('should send digest', (done) => {
db.sortedSetAdd('digest:day:uids', [Date.now(), Date.now()], [1, 2], (err) => {
assert.ifError(err);