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

Revert "adding functionTimeout to settings"

Browse Source 
This reverts commit a44f23c4e206bc31c60153bb180ddd8875f9f9da.
This commit is contained in:
Kilian Hertel 2023-08-04 11:19:35 +02:00
parent 8069c9a524
commit 13c5d4debe
4 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/node_modules/@node-red/nodes/core/function/10-function.html vendored
View File

@ -360,10 +360,6 @@
name: {value:"_DEFAULT_"}, name: {value:"_DEFAULT_"},
func: {value:"\nreturn msg;"}, func: {value:"\nreturn msg;"},
outputs: {value:1}, outputs: {value:1},
<<<<<<< Updated upstream
=======
timeout:{value:RED.settings.functionTimeout},
>>>>>>> Stashed changes
noerr: {value:0,required:true, noerr: {value:0,required:true,
validate: function(v, opt) { validate: function(v, opt) {
if (!v) { if (!v) {

3
packages/node_modules/@node-red/nodes/core/function/10-function.js vendored
View File

@ -503,8 +503,7 @@ module.exports = function(RED) {
RED.nodes.registerType("function",FunctionNode, { RED.nodes.registerType("function",FunctionNode, {
dynamicModuleList: "libs", dynamicModuleList: "libs",
settings: { settings: {
functionExternalModules: { value: true, exportable: true }, functionExternalModules: { value: true, exportable: true }
functionTimeout: { value:0, exportable: true }
} }
}); });
RED.library.register("functions"); RED.library.register("functions");

5
packages/node_modules/node-red/settings.js vendored
View File

@ -454,9 +454,6 @@ module.exports = {
/** Allow the Function node to load additional npm modules directly */ /** Allow the Function node to load additional npm modules directly */
functionExternalModules: true, functionExternalModules: true,
/** a default timeout for function node VM*/
functionTimeout:30,
/** The following property can be used to set predefined values in Global Context. /** The following property can be used to set predefined values in Global Context.
* This allows extra node modules to be made available with in Function node. * This allows extra node modules to be made available with in Function node.
* For example, the following: * For example, the following:
@ -468,8 +465,6 @@ module.exports = {
// os:require('os'), // os:require('os'),
}, },
/** The maximum number of messages nodes will buffer internally as part of their /** The maximum number of messages nodes will buffer internally as part of their
* operation. This applies across a range of nodes that operate on message sequences. * operation. This applies across a range of nodes that operate on message sequences.
* defaults to no limit. A value of 0 also means no limit is applied. * defaults to no limit. A value of 0 also means no limit is applied.

27
test/nodes/core/function/10-function_spec.js
View File

@ -1426,33 +1426,6 @@ describe('function node', function() {
it('check if default function settings grab', function(done) {
RED.seetings.functionTimeout = 0.01;
var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"while(1==1){};\nreturn msg;"}];
helper.load(functionNode, flow, function() {
var n1 = helper.getNode("n1");
n1.receive({payload:"foo",topic: "bar"});
setTimeout(function() {
try {
helper.log().called.should.be.true();
var logEvents = helper.log().args.filter(function(evt) {
return evt[0].type == "function";
});
logEvents.should.have.length(1);
var msg = logEvents[0][0];
msg.should.have.property('level', helper.log().ERROR);
msg.should.have.property('id', 'n1');
msg.should.have.property('type', 'function');
should.equal(msg.msg.message, 'Script execution timed out after 10ms');
delete RED.settings.functionExternalModules;
done();
} catch(err) {
done(err);
}
},50);
});
});
describe("finalize function", function() { describe("finalize function", function() {
it('should execute', function(done) { it('should execute', function(done) {