frodovdr/node-red-nodes
1
0
Fork 0
mirror of https://github.com/node-red/node-red-nodes.git synced 2025-03-01 10:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #875 node red node tail potentially stops working (#877)

Browse Source
This commit is contained in:
realgnark 2022-01-16 18:23:45 +01:00 committed by GitHub
parent 28580c33ea
commit b92ca63f93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
storage/tail/28-tail.js
View File

@ -12,6 +12,8 @@ module.exports = function(RED) {
this.split = new RegExp(n.split.replace(/\\r/g,'\r').replace(/\\n/g,'\n').replace(/\\t/g,'\t') || "[\r]{0,1}\n"); this.split = new RegExp(n.split.replace(/\\r/g,'\r').replace(/\\n/g,'\n').replace(/\\t/g,'\t') || "[\r]{0,1}\n");
var node = this; var node = this;
node.tout = null;
var fileTail = function() { var fileTail = function() {
if (fs.existsSync(node.filename)) { if (fs.existsSync(node.filename)) {
if (node.filetype === "text") { if (node.filetype === "text") {
@ -41,11 +43,29 @@ module.exports = function(RED) {
}); });
} }
else { else {
node.tout = setTimeout(function() { fileTail(); },10000); scheduleRestart();
node.warn(RED._("tail.errors.filenotfound") + ": "+node.filename); node.warn(RED._("tail.errors.filenotfound") + ": "+node.filename);
} }
} }
var scheduleRestart = function() {
node.tout = setTimeout(function() {
node.tout = null;
fileTail();
}, 10000);
};
var cancelRestart = function() {
if (isRestartPending()) {
clearTimeout(node.tout);
node.tout = null;
}
};
var isRestartPending = function() {
return node.tout !== null;
};
if (node.filename !== "") { if (node.filename !== "") {
node.status({}); node.status({});
fileTail(); fileTail();
@ -57,12 +77,12 @@ module.exports = function(RED) {
} else if (msg.filename === "") { } else if (msg.filename === "") {
node.filename = ""; node.filename = "";
if (node.tail) { node.tail.unwatch(); } if (node.tail) { node.tail.unwatch(); }
if (node.tout) { clearTimeout(node.tout); } cancelRestart();
node.status({ fill: "grey", text: "tail.state.stopped" }); node.status({ fill: "grey", text: "tail.state.stopped" });
} else { } else {
node.filename = msg.filename; node.filename = msg.filename;
if (node.tail) { node.tail.unwatch(); } if (node.tail) { node.tail.unwatch(); }
if (!node.tout) { fileTail(); } if (!isRestartPending()) { fileTail(); }
node.status({ fill: "green", text: node.filename }); node.status({ fill: "green", text: node.filename });
} }
}); });
@ -72,7 +92,7 @@ module.exports = function(RED) {
/* istanbul ignore else */ /* istanbul ignore else */
if (node.tail) { node.tail.unwatch(); } if (node.tail) { node.tail.unwatch(); }
delete node.tail; delete node.tail;
if (node.tout) { clearTimeout(node.tout); } cancelRestart();
}); });
} }