frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Full fix for #11

This commit is contained in:
Nicholas O'Leary 2013-09-07 14:27:41 +01:00
parent 07ff9aa061
commit 7b4927ff5d
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nodes/core/20-inject.html
View File

@ -73,18 +73,17 @@
if (err) {
if (err.status == 404) {
RED.notify("<strong>Error</strong>: inject node not deployed","error");
} else {
} else if (err.status == 500) {
RED.notify("<strong>Error</strong>: inject failed, see log for details.","error");
} else if (err.status == 0) {
RED.notify("<strong>Error</strong>: no response from server","error");
} else {
RED.notify("<strong>Error</strong>: unexpected error: ("+err.status+")"+err.response,"error");
}
} else if (resp.status == 200) {
RED.notify("Successfully injected: "+label,"success");
} else {
if (resp) {
RED.notify("<strong>Error</strong>: unexpected response: RC "+resp.status+"<br/>See console log for details."error");
} else {
RED.notify("<strong>Error</strong>: no response from server","error");
}
console.log(err,resp);
RED.notify("<strong>Error</strong>: unexpected response: ("+resp.status+") "+resp.response,"error");
}
});
}

10
nodes/core/20-inject.js
View File

@ -57,8 +57,14 @@ InjectNode.prototype.close = function() {
RED.app.post("/inject/:id", function(req,res) {
var node = RED.nodes.getNode(req.params.id);
if (node != null) {
node.receive();
res.send(200);
try {
node.receive();
res.send(200);
} catch(err) {
res.send(500);
node.error("Inject failed:"+err);
console.log(err.stack);
}
} else {
res.send(404);
}

11
nodes/core/58-debug.html
View File

@ -66,8 +66,10 @@
if (err) {
if (err.status == 404) {
RED.notify("<strong>Error</strong>: debug node not deployed","error");
} else {
} else if (err.status == 0) {
RED.notify("<strong>Error</strong>: no response from server","error");
} else {
RED.notify("<strong>Error</strong>: unexpected error: ("+err.status+")"+err.response,"error");
}
} else if (resp.status == 200) {
RED.notify("Successfully activated: "+label,"success");
@ -80,12 +82,7 @@
node.dirty = true;
RED.view.redraw();
} else {
if (resp) {
RED.notify("<strong>Error</strong>: unexpected response: "+resp,"error");
} else {
RED.notify("<strong>Error</strong>: no response from server","error");
}
console.log(err,resp);
RED.notify("<strong>Error</strong>: unexpected response: ("+resp.status+") "+resp.response,"error");
}
});
}