Merge branch 'master' into logging

# Conflicts:
#	server/database.js
#	server/jobs.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/socket-handlers/status-page-socket-handler.js
#	server/util-server.js
This commit is contained in:
Louis Lam
2022-04-12 16:32:14 +08:00
128 changed files with 14015 additions and 6527 deletions

View File

@@ -2,7 +2,7 @@ const path = require("path");
const Bree = require("bree");
const { SHARE_ENV } = require("worker_threads");
const { log_info } = require("../src/util");
let bree;
const jobs = [
{
name: "clear-old-data",
@@ -11,7 +11,7 @@ const jobs = [
];
const initBackgroundJobs = function (args) {
const bree = new Bree({
bree = new Bree({
root: path.resolve("server", "jobs"),
jobs,
worker: {
@@ -27,6 +27,13 @@ const initBackgroundJobs = function (args) {
return bree;
};
module.exports = {
initBackgroundJobs
const stopBackgroundJobs = function () {
if (bree) {
bree.stop();
}
};
module.exports = {
initBackgroundJobs,
stopBackgroundJobs
};