From c4f30a6111f5253b8e0977a41a7f41f8d1a67f8a Mon Sep 17 00:00:00 2001 From: Dave C-J Date: Sun, 20 Oct 2013 20:37:40 +0100 Subject: [PATCH] remove extra logging from exec , add sun icon --- nodes/core/75-exec.js | 93 +++++++++++++++++++++--------------------- public/icons/sun.png | Bin 0 -> 383 bytes 2 files changed, 46 insertions(+), 47 deletions(-) create mode 100644 public/icons/sun.png diff --git a/nodes/core/75-exec.js b/nodes/core/75-exec.js index 30e7b5c44..03f4ed284 100644 --- a/nodes/core/75-exec.js +++ b/nodes/core/75-exec.js @@ -20,57 +20,56 @@ var spawn = require('child_process').spawn; var exec = require('child_process').exec; function ExecNode(n) { - RED.nodes.createNode(this,n); - this.cmd = n.command; - this.append = n.append || ""; - this.useSpawn = n.useSpawn; + RED.nodes.createNode(this,n); + this.cmd = n.command; + this.append = n.append || ""; + this.useSpawn = n.useSpawn; - var node = this; - this.on("input", function(msg) { - if (msg != null) { + var node = this; + this.on("input", function(msg) { + if (msg != null) { - if (this.useSpawn == true) { - // make the extra args into an array - // then prepend with the msg.payload - var arg = node.append.split(","); - if (msg.payload != " ") { arg.unshift(msg.payload); } - //console.log(arg); - var ex = spawn(node.cmd,arg); - ex.stdout.on('data', function (data) { - //console.log('[exec] stdout: ' + data); - msg.payload = data; - node.send([msg,null,null]); - }); - ex.stderr.on('data', function (data) { - //console.log('[exec] stderr: ' + data); - msg.payload = data; - node.send([null,msg,null]); - }); - ex.on('close', function (code) { - //console.log('[exec] result: ' + code); - msg.payload = code; - node.send([null,null,msg]); - }); - } + if (this.useSpawn == true) { + // make the extra args into an array + // then prepend with the msg.payload + var arg = node.append.split(","); + if (msg.payload != " ") { arg.unshift(msg.payload); } + //console.log(arg); + var ex = spawn(node.cmd,arg); + ex.stdout.on('data', function (data) { + //console.log('[exec] stdout: ' + data); + msg.payload = data; + node.send([msg,null,null]); + }); + ex.stderr.on('data', function (data) { + //console.log('[exec] stderr: ' + data); + msg.payload = data; + node.send([null,msg,null]); + }); + ex.on('close', function (code) { + //console.log('[exec] result: ' + code); + msg.payload = code; + node.send([null,null,msg]); + }); + } - else { - var cl = node.cmd+" "+msg.payload+" "+node.append; - node.log(cl); - var child = exec(cl, function (error, stdout, stderr) { - msg.payload = stdout; - var msg2 = {payload:stderr}; - //console.log('[exec] stdout: ' + stdout); - //console.log('[exec] stderr: ' + stderr); - if (error !== null) { - var msg3 = {payload:error}; - //console.log('[exec] error: ' + error); - } - node.send([msg,msg2,msg3]); - }); - } - } + else { + var cl = node.cmd+" "+msg.payload+" "+node.append; + var child = exec(cl, function (error, stdout, stderr) { + msg.payload = stdout; + var msg2 = {payload:stderr}; + //console.log('[exec] stdout: ' + stdout); + //console.log('[exec] stderr: ' + stderr); + if (error !== null) { + var msg3 = {payload:error}; + //console.log('[exec] error: ' + error); + } + node.send([msg,msg2,msg3]); + }); + } + } - }); + }); } RED.nodes.registerType("exec",ExecNode); diff --git a/public/icons/sun.png b/public/icons/sun.png new file mode 100644 index 0000000000000000000000000000000000000000..c4918e5621be46bb2484c7430a498b7e17341648 GIT binary patch literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^%0O(y!3HF+1t+BgDaPU;cPEB*=VV?2Ic!PZ?k+$Y z2!1;6t_M<_1s;*b3=G`DAk4@xYmNj^i;$;_V@Sl|x6{w^HXHD?eqOZBL4WD%f>Z{! zL{7Gq5v#vk>br3GwQ2~5>O*x2iyylc6d&2x9}hEd3lwn;P>z(}e`^JrzJS;@IcfMwv=XLJan@I)gBI!HSr(FpNI`PKHbB=6$ zQ`x)rOHO<<56o8gGE$D5nB!Tdvj5%9UEgoYt(`f!ra+E=(#|Opx?ZnXHf!l?&89B#&@BLCW>9A;T=I9K0ANBZ%9e+*~!^a$@qcKS*G;9?cepMRvyvlTBOk> a^pO4dse`}D&T;dDg3i;`&t;ucLK6T#V4E}m literal 0 HcmV?d00001