Extract all core runtime messages

This commit is contained in:
Nick O'Leary
2015-05-08 14:21:01 +01:00
parent aa18c65fa8
commit 6249083431
13 changed files with 123 additions and 64 deletions

View File

@@ -15,6 +15,7 @@
**/
var log = require("../log");
var redNodes = require("../nodes");
var settings = require("../settings");
@@ -30,7 +31,7 @@ module.exports = {
redNodes.setFlows(flows,deploymentType).then(function() {
res.send(204);
}).otherwise(function(err) {
log.warn("Error saving flows : "+err.message);
log.warn(log._("api.flows.error-save",{message:err.message}));
log.warn(err.stack);
res.json(500,{error:"unexpected_error", message:err.message});
});

View File

@@ -17,6 +17,7 @@
var redApp = null;
var storage = require("../storage");
var log = require("../log");
var needsPermission = require("./auth").needsPermission;
function createLibrary(type) {
@@ -34,7 +35,7 @@ function createLibrary(type) {
}
}).otherwise(function(err) {
if (err) {
log.warn("Error loading library entry '"+path+"' : "+err);
log.warn(log._("api.library.error-load-entry",{path:path,message:err}));
if (err.message.indexOf('forbidden') === 0) {
log.audit({event: "library.get",type:type,error:"forbidden"},req);
res.send(403);
@@ -56,7 +57,7 @@ function createLibrary(type) {
log.audit({event: "library.set",type:type},req);
res.send(204);
}).otherwise(function(err) {
log.warn("Error saving library entry '"+path+"' : "+err);
log.warn(log._("api.library.error-save-entry",{path:path,message:err}));
if (err.message.indexOf('forbidden') === 0) {
log.audit({event: "library.set",type:type,error:"forbidden"},req);
res.send(403);
@@ -88,7 +89,7 @@ module.exports = {
res.send(data);
}).otherwise(function(err) {
if (err) {
log.warn("Error loading flow '"+req.params[0]+"' : "+err);
log.warn(log._("api.library.error-load-flow",{path:req.params[0],message:err}));
if (err.message.indexOf('forbidden') === 0) {
log.audit({event: "library.get",type:"flow",path:req.params[0],error:"forbidden"},req);
res.send(403);
@@ -105,7 +106,7 @@ module.exports = {
log.audit({event: "library.set",type:"flow",path:req.params[0]},req);
res.send(204);
}).otherwise(function(err) {
log.warn("Error loading flow '"+req.params[0]+"' : "+err);
log.warn(log._("api.library.error-save-flow",{path:req.params[0],message:err}));
if (err.message.indexOf('forbidden') === 0) {
log.audit({event: "library.set",type:"flow",path:req.params[0],error:"forbidden"},req);
res.send(403);

View File

@@ -226,12 +226,12 @@ function putNode(node, enabled) {
return promise.then(function(info) {
if (info.enabled === enabled && !info.err) {
comms.publish("node/"+(enabled?"enabled":"disabled"),info,false);
log.info(" "+(enabled?"Enabled":"Disabled")+" node types:");
log.info(" "+log._("api.nodes."+(enabled?"enabled":"disabled")));
for (var i=0;i<info.types.length;i++) {
log.info(" - "+info.types[i]);
}
} else if (enabled && info.err) {
log.warn("Failed to enable node:");
log.warn(log._("api.nodes.error-enable"));
log.warn(" - "+info.name+" : "+info.err);
}
return info;