Move node install/remove from server component to node engine

This commit is contained in:
Nick O'Leary
2015-11-08 14:06:36 +00:00
parent 1c45bc615f
commit 985875cc75
7 changed files with 291 additions and 304 deletions

View File

@@ -15,7 +15,6 @@
**/
var redNodes = require("../nodes");
var comms = require("../comms");
var server = require("../server");
var log = require("../log");
var i18n = require("../i18n");
@@ -50,15 +49,14 @@ module.exports = {
res.status(400).json({error:"module_already_loaded", message:"Module already loaded"});
return;
}
promise = server.installModule(node.module);
} else if (node.file) {
promise = server.installNode(node.file);
promise = redNodes.installModule(node.module);
} else {
log.audit({event: "nodes.install",module:node.module,error:"invalid_request"},req);
res.status(400).json({error:"invalid_request", message:"Invalid request"});
return;
}
promise.then(function(info) {
comms.publish("node/added",info.nodes,false);
if (node.module) {
log.audit({event: "nodes.install",module:node.module},req);
res.json(redNodes.getModuleInfo(node.module));
@@ -95,10 +93,11 @@ module.exports = {
res.status(404).end();
return;
} else {
promise = server.uninstallModule(mod);
promise = redNodes.uninstallModule(mod);
}
promise.then(function() {
promise.then(function(list) {
comms.publish("node/removed",list,false);
log.audit({event: "nodes.remove",module:mod},req);
res.status(204).end();
}).otherwise(function(err) {