From aa47bae2adc347152e170f231d154613c97f65b1 Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Wed, 13 Jan 2021 10:12:19 +0000 Subject: [PATCH] Exec node - don't append msg.payload to command by default (#2818) * exec change default to not append payload --- .../@node-red/nodes/core/function/90-exec.html | 2 +- .../node_modules/@node-red/nodes/core/function/90-exec.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/node_modules/@node-red/nodes/core/function/90-exec.html b/packages/node_modules/@node-red/nodes/core/function/90-exec.html index 636117d71..789e15f75 100644 --- a/packages/node_modules/@node-red/nodes/core/function/90-exec.html +++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.html @@ -52,7 +52,7 @@ color:"darksalmon", defaults: { command: {value:""}, - addpay: {value:true}, + addpay: {value:false}, append: {value:""}, useSpawn: {value:"false"}, timer: {value:""}, diff --git a/packages/node_modules/@node-red/nodes/core/function/90-exec.js b/packages/node_modules/@node-red/nodes/core/function/90-exec.js index 0df3e6012..a92bab9af 100644 --- a/packages/node_modules/@node-red/nodes/core/function/90-exec.js +++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.js @@ -31,12 +31,12 @@ module.exports = function(RED) { this.timer = Number(n.timer || 0)*1000; this.activeProcesses = {}; this.oldrc = (n.oldrc || false).toString(); - this.execOpt = {encoding:'binary', maxBuffer:10000000}; + this.execOpt = {encoding:'binary', maxBuffer:10000000}; var node = this; - if (process.platform === 'linux' && fs.existsSync('/bin/bash')) { node.execOpt.shell = '/bin/bash'; } - - var cleanup = function(p) { + if (process.platform === 'linux' && fs.existsSync('/bin/bash')) { node.execOpt.shell = '/bin/bash'; } + + var cleanup = function(p) { node.activeProcesses[p].kill(); //node.status({fill:"red",shape:"dot",text:"timeout"}); //node.error("Exec node timeout");