Add hang detection to FactorioServer.stop()

Attempt to detect if the Factorio server has hanged in
FactorioServer.stop() and send a second SIGTERM if this is the case.
This commit is contained in:
Hornwitser committed 2019-10-28 21:58:54 +01:00
1 parent a781c2f988
commit 246a8031c1
2 files changed
+55 -1

No files matched your search

+38 -1
View File
@@ -281,6 +281,17 @@ const outputHeuristics = [
}
},
// Message indicating the server is shutting down
{
filter: {
type: 'generic',
message: /^Quitting: /
},
action: function(output) {
this.emit('_quitting');
}
},
// Messages that might be tha cause of an unexpected shutdown.
{
filter: {
@@ -636,7 +647,33 @@ class FactorioServer extends events.EventEmitter {
// developers. Rcon does not recognize /quit, stdin is not
// recognized, and there's no "send CTRL+C to process" on Windows.
this._server.kill();
await events.once(this._server, 'exit');
// There appears to be an race condition where sending SIGTERM
// immediatly before the RCON interface comes online causes the
// Factorio server to hang. It's also possible the server doesn't
// stop if it's stuck with an infinite lua code loop.
if (process.platform !== "win32") {
let hanged = true;
function setAlive(output) { hanged = false; }
this.on('_quitting', setAlive);
let timeoutId = setTimeout(() => {
if (hanged) {
console.error("Factorio appears to have hanged, sending second SIGTERM");
this._server.kill();
}
}, 5000);
await events.once(this._server, 'exit');
clearTimeout(timeoutId);
this.off('_quitting', setAlive);
// On windows the process is terminated immediately, but to keep
// ordering wait until after the exit event here.
} else {
await events.once(this._server, 'exit');
}
}
/**