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

SVR.JS now sends configuration file saving request to one random good worker instead of all workers to prevent configuration file corruption.

Browse source
This commit is contained in:
Dorian Niemiec 2023-11-12 18:33:29 +01:00
parent fccc0ef7ca
commit ae45c2e132
2 changed files with 53 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.json
View file

@ -3,7 +3,7 @@
"port": 80, "port": 80,
"pubport": 80, "pubport": 80,
"page404": "404.html", "page404": "404.html",
"timestamp": 1694540087592, "timestamp": 1699810328987,
"blacklist": [], "blacklist": [],
"nonStandardCodes": [], "nonStandardCodes": [],
"enableCompression": true, "enableCompression": true,

61
svr.js
View file

@ -4590,6 +4590,7 @@ function bruteForceListenerWrapper(worker) {
} }
var isWorkerHungUpBuff = true; var isWorkerHungUpBuff = true;
var isWorkerHungUpBuff2 = true;
function msgListener(msg) { function msgListener(msg) {
for (var i = 0; i < Object.keys(cluster.workers).length; i++) { for (var i = 0; i < Object.keys(cluster.workers).length; i++) {
@ -4605,6 +4606,8 @@ function msgListener(msg) {
// Do nothing! // Do nothing!
} else if (msg == "\x12KILLOK") { } else if (msg == "\x12KILLOK") {
if(typeof isWorkerHungUpBuff != "undefined") isWorkerHungUpBuff = false; if(typeof isWorkerHungUpBuff != "undefined") isWorkerHungUpBuff = false;
} else if (msg == "\x12PINGOK") {
if(typeof isWorkerHungUpBuff2 != "undefined") isWorkerHungUpBuff2 = false;
} else if (msg == "\x12KILLTERMMSG") { } else if (msg == "\x12KILLTERMMSG") {
serverconsole.locmessage("Terminating unused worker process..."); serverconsole.locmessage("Terminating unused worker process...");
} else if (msg == "\x12SAVEGOOD") { } else if (msg == "\x12SAVEGOOD") {
@ -4981,21 +4984,55 @@ function start(init) {
} else if (cluster.isPrimary) { } else if (cluster.isPrimary) {
setInterval(function () { setInterval(function () {
var allClusters = Object.keys(cluster.workers); var allClusters = Object.keys(cluster.workers);
for (var i = 0; i < allClusters.length; i++) { var goodWorkers = [];
function checkWorker(callback, _id) {
if(typeof _id === "undefined") _id = 0;
if(_id >= allClusters.length) {
callback();
return;
}
try { try {
if (cluster.workers[allClusters[i]]) { if (cluster.workers[allClusters[_id]]) {
cluster.workers[allClusters[i]].on("message", msgListener); isWorkerHungUpBuff2 = true;
cluster.workers[allClusters[i]].send("\x14SAVECONF"); cluster.workers[allClusters[_id]].on("message", msgListener);
cluster.workers[allClusters[_id]].send("\x14PINGPING");
setTimeout(function () {
if (isWorkerHungUpBuff2) {
checkWorker(callback, _id+1);
} else {
goodWorkers.push(allClusters[_id]);
checkWorker(callback, _id+1);
}
}, 250);
} else {
checkWorker(callback, _id+1);
} }
} catch (err) { } catch (err) {
if (cluster.workers[allClusters[i]]) { if (cluster.workers[allClusters[_id]]) {
cluster.workers[allClusters[i]].removeAllListeners("message"); cluster.workers[allClusters[_id]].removeAllListeners("message");
cluster.workers[allClusters[i]].on("message", bruteForceListenerWrapper(cluster.workers[allClusters[i]])); cluster.workers[allClusters[_id]].on("message", bruteForceListenerWrapper(cluster.workers[allClusters[_id]]));
cluster.workers[allClusters[i]].on("message", listenConnListener); cluster.workers[allClusters[_id]].on("message", listenConnListener);
}
checkWorker(callback, _id+1);
}
}
checkWorker(function () {
var wN = Math.floor(Math.random() * goodWorkers.length); //Send a configuration saving message to a random worker.
try {
if (cluster.workers[goodWorkers[wN]]) {
isWorkerHungUpBuff2 = true;
cluster.workers[goodWorkers[wN]].on("message", msgListener);
cluster.workers[goodWorkers[wN]].send("\x14SAVECONF");
}
} catch (err) {
if (cluster.workers[goodWorkers[wN]]) {
cluster.workers[goodWorkers[wN]].removeAllListeners("message");
cluster.workers[goodWorkers[wN]].on("message", bruteForceListenerWrapper(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) { if (!cluster.isPrimary) {
@ -5029,6 +5066,12 @@ function start(init) {
process.send("\x12END"); process.send("\x12END");
} }
// Refuse to send, when it's really exiting. Main process will treat the worker as hung up anyway... // 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("\x12END");
}
// Refuse to send, when it's really exiting. Main process will treat the worker as hung up anyway...
} else if (line == "\x14KILLREQ") { } else if (line == "\x14KILLREQ") {
if(reqcounter - reqcounterKillReq < 2) { if(reqcounter - reqcounterKillReq < 2) {
process.send("\x12KILLTERMMSG"); process.send("\x12KILLTERMMSG");