frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

move node.send in exec and httprequest nodes

Browse Source 
just in case
This commit is contained in:
Dave Conway-Jones 2018-02-06 11:34:24 +00:00
parent 415c768ae4
commit 5931e13b9c
No known key found for this signature in database
GPG Key ID: 9E7F9C73F5168CD4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodes/core/core/75-exec.js
View File

@ -152,9 +152,9 @@ module.exports = function(RED) {
msg.rc = msg3.payload; msg.rc = msg3.payload;
if (msg2) { msg2.rc = msg3.payload; } if (msg2) { msg2.rc = msg3.payload; }
} }
node.send([msg,msg2,msg3]);
if (child.tout) { clearTimeout(child.tout); } if (child.tout) { clearTimeout(child.tout); }
delete node.activeProcesses[child.pid]; delete node.activeProcesses[child.pid];
node.send([msg,msg2,msg3]);
}); });
node.status({fill:"blue",shape:"dot",text:"pid:"+child.pid}); node.status({fill:"blue",shape:"dot",text:"pid:"+child.pid});
child.on('error',function() {}); child.on('error',function() {});

5
nodes/core/io/21-httprequest.js
View File

@ -263,9 +263,8 @@ module.exports = function(RED) {
catch(e) { node.warn(RED._("httpin.errors.json-error")); } catch(e) { node.warn(RED._("httpin.errors.json-error")); }
} }
} }
node.send(msg);
node.status({}); node.status({});
node.send(msg);
} }
}); });
}); });
@ -280,8 +279,8 @@ module.exports = function(RED) {
node.error(err,msg); node.error(err,msg);
msg.payload = err.toString() + " : " + url; msg.payload = err.toString() + " : " + url;
msg.statusCode = err.code; msg.statusCode = err.code;
node.send(msg);
node.status({fill:"red",shape:"ring",text:err.code}); node.status({fill:"red",shape:"ring",text:err.code});
node.send(msg);
}); });
if (payload) { if (payload) {
req.write(payload); req.write(payload);