From 76728c28b5ba3605a184d599e671cac29f6a680b Mon Sep 17 00:00:00 2001 From: Moe Date: Tue, 14 Feb 2023 14:08:51 -0800 Subject: [PATCH] make cron get conf.json from main process --- libs/cron.js | 4 +++- libs/cron/worker.js | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/cron.js b/libs/cron.js index b6b60b4a..55e9065c 100644 --- a/libs/cron.js +++ b/libs/cron.js @@ -7,7 +7,9 @@ module.exports = (s,config,lang) => { if(config.doCronAsWorker===undefined)config.doCronAsWorker = true; const startWorker = () => { const pathToWorkerScript = __dirname + `/cron/worker.js` - const workerProcess = new Worker(pathToWorkerScript) + const workerProcess = new Worker(pathToWorkerScript,{ + workerData: config + }) workerProcess.on('message',function(data){ if(data.time === 'moment()')data.time = moment(); switch(data.f){ diff --git a/libs/cron/worker.js b/libs/cron/worker.js index e7a08a58..0c011f72 100644 --- a/libs/cron/worker.js +++ b/libs/cron/worker.js @@ -3,8 +3,8 @@ const path = require('path'); const moment = require('moment'); const exec = require('child_process').exec; const spawn = require('child_process').spawn; -const { parentPort, isMainThread } = require('worker_threads'); -const config = require(process.cwd() + '/conf.json') +const { parentPort, isMainThread, workerData } = require('worker_threads'); +const config = workerData process.on('uncaughtException', function (err) { errorLog('uncaughtException',err); });