DorianNiemiecSVRJS/svrjs
Archived
1
0
Fork 0
forked from svrjs/svrjs
Code Pull requests Activity

Implement configuration file saving interval

Browse source
This commit is contained in:
Dorian Niemiec 2024-08-26 06:17:51 +02:00
parent ab98415030
commit 96dfe853d4
1 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/index.js
View file

@ -1262,7 +1262,7 @@ process.messageEventListeners.push((worker, serverconsole) => {
}; };
}); });
let isWorkerHungUpBuff = true; let isWorkerHungUpBuff2 = true;
function msgListener(message) { function msgListener(message) {
if (message == "\x12END") { if (message == "\x12END") {
@ -1279,8 +1279,14 @@ function msgListener(message) {
closedMaster = true; closedMaster = true;
} else if (message == "\x12KILLOK") { } else if (message == "\x12KILLOK") {
if (typeof isWorkerHungUpBuff != "undefined") isWorkerHungUpBuff = false; if (typeof isWorkerHungUpBuff != "undefined") isWorkerHungUpBuff = false;
} else if (message == "\x12PINGOK") {
if (typeof isWorkerHungUpBuff2 != "undefined") isWorkerHungUpBuff2 = false;
} else if (message == "\x12KILLTERMMSG") { } else if (message == "\x12KILLTERMMSG") {
serverconsole.locmessage("Terminating unused worker process..."); serverconsole.locmessage("Terminating unused worker process...");
} else if (message == "\x12SAVEGOOD") {
serverconsole.locmessage("Configuration saved.");
} else if (message.indexOf("\x12SAVEERR") == 0) {
serverconsole.locwarnmessage("There was a problem while saving configuration file. Reason: " + message.substring(8));
} else if (message[0] == "\x12") { } else if (message[0] == "\x12") {
console.log("RECEIVED CONTROL MESSAGE: " + message.substr(1)); console.log("RECEIVED CONTROL MESSAGE: " + message.substr(1));
} else { } else {
@ -1288,6 +1294,11 @@ function msgListener(message) {
} }
} }
function saveConfig() {
// TODO: saveConfig() function
throw new Error("Configuration saving not yet implemented.");
}
// Starting function // Starting function
function start(init) { function start(init) {
init = Boolean(init); init = Boolean(init);
@ -1598,7 +1609,7 @@ function start(init) {
let workersToFork = 1; let workersToFork = 1;
// TODO: saveConfig // TODO: saveConfig
/*if (cluster.isPrimary === undefined) { if (cluster.isPrimary === undefined) {
setInterval(function () { setInterval(function () {
try { try {
saveConfig(); saveConfig();
@ -1612,7 +1623,7 @@ function start(init) {
var allWorkers = Object.keys(cluster.workers); var allWorkers = Object.keys(cluster.workers);
var goodWorkers = []; var goodWorkers = [];
function checkWorker(callback, _id) { const checkWorker = (callback, _id) => {
if (typeof _id === "undefined") _id = 0; if (typeof _id === "undefined") _id = 0;
if (_id >= allWorkers.length) { if (_id >= allWorkers.length) {
callback(); callback();
@ -1637,14 +1648,13 @@ function start(init) {
} catch (err) { } catch (err) {
if (cluster.workers[allWorkers[_id]]) { if (cluster.workers[allWorkers[_id]]) {
cluster.workers[allWorkers[_id]].removeAllListeners("message"); cluster.workers[allWorkers[_id]].removeAllListeners("message");
cluster.workers[allWorkers[_id]].on("message", bruteForceListenerWrapper(cluster.workers[allWorkers[_id]])); addListenersToWorker(cluster.workers[allWorkers[_id]]);
cluster.workers[allWorkers[_id]].on("message", listenConnListener);
} }
checkWorker(callback, _id + 1); checkWorker(callback, _id + 1);
} }
} }
checkWorker(function () { checkWorker(function () {
var wN = Math.floor(Math.random() * goodWorkers.length); //Send a configuration saving message to a random worker. const wN = Math.floor(Math.random() * goodWorkers.length); //Send a configuration saving message to a random worker.
try { try {
if (cluster.workers[goodWorkers[wN]]) { if (cluster.workers[goodWorkers[wN]]) {
isWorkerHungUpBuff2 = true; isWorkerHungUpBuff2 = true;
@ -1654,14 +1664,13 @@ function start(init) {
} catch (err) { } catch (err) {
if (cluster.workers[goodWorkers[wN]]) { if (cluster.workers[goodWorkers[wN]]) {
cluster.workers[goodWorkers[wN]].removeAllListeners("message"); cluster.workers[goodWorkers[wN]].removeAllListeners("message");
cluster.workers[goodWorkers[wN]].on("message", bruteForceListenerWrapper(cluster.workers[goodWorkers[wN]])); addListenersToWorker(cluster.workers[goodWorkers[wN]]);
cluster.workers[goodWorkers[wN]].on("message", listenConnListener);
} }
serverconsole.locwarnmessage("There was a problem while saving configuration file. Reason: " + err.message); serverconsole.locwarnmessage("There was a problem while saving configuration file. Reason: " + err.message);
} }
}); });
}, 300000); }, 300000);
}*/ }
if (!cluster.isPrimary && cluster.isPrimary !== undefined) { if (!cluster.isPrimary && cluster.isPrimary !== undefined) {
process.on("message", function (line) { process.on("message", function (line) {
@ -1669,7 +1678,7 @@ function start(init) {
if (line == "") { if (line == "") {
// Does Nothing // Does Nothing
process.send("\x12END"); process.send("\x12END");
} /*else if (line == "\x14SAVECONF") { } else if (line == "\x14SAVECONF") {
// Save configuration file // Save configuration file
try { try {
saveConfig(); saveConfig();
@ -1678,19 +1687,13 @@ function start(init) {
process.send("\x12SAVEERR" + err.message); process.send("\x12SAVEERR" + err.message);
} }
process.send("\x12END"); process.send("\x12END");
}*/ else if (line == "\x14KILLPING") { } else if (line == "\x14KILLPING") {
//if (!reallyExiting) {
process.send("\x12KILLOK"); process.send("\x12KILLOK");
process.send("\x12END"); process.send("\x12END");
//} } else if (line == "\x14PINGPING") {
// Refuse to send, when it's really exiting. Main process will treat the worker as hung up anyway...
} /* else if (line == "\x14PINGPING") {
if (!reallyExiting) {
process.send("\x12PINGOK"); process.send("\x12PINGOK");
process.send("\x12END"); process.send("\x12END");
} } else if (line == "\x14KILLREQ") {
// Refuse to send, when it's really exiting. Main process will treat the worker as hung up anyway...
}*/ else if (line == "\x14KILLREQ") {
if (process.reqcounter - reqcounterKillReq < 2) { if (process.reqcounter - reqcounterKillReq < 2) {
process.send("\x12KILLTERMMSG"); process.send("\x12KILLTERMMSG");
process.nextTick(() => { process.nextTick(() => {