Update logging/metric system

This commit is contained in:
Nick O'Leary
2015-02-03 22:02:26 +00:00
parent 7d6ce1ec12
commit 0aaea1ec40
24 changed files with 245 additions and 209 deletions

View File

@@ -18,10 +18,11 @@ var fs = require('fs');
var when = require('when');
var nodeFn = require('when/node/function');
var keys = require('when/keys');
var util = require('util');
var fspath = require("path");
var mkdirp = require("mkdirp");
var log = require("../log");
var promiseDir = nodeFn.lift(mkdirp);
var settings;
@@ -170,12 +171,12 @@ var localfilesystem = {
var defer = when.defer();
fs.exists(flowsFullPath, function(exists) {
if (exists) {
util.log("[red] Loading flows : "+flowsFile);
log.info("Loading flows : "+flowsFile);
defer.resolve(nodeFn.call(fs.readFile,flowsFullPath,'utf8').then(function(data) {
return JSON.parse(data);
}));
} else {
util.log("[red] Flows file not found : "+flowsFile );
log.info("Flows file not found : "+flowsFile );
defer.resolve([]);
}
});
@@ -236,7 +237,7 @@ var localfilesystem = {
try {
return JSON.parse(data);
} catch(err) {
util.log("[red] Corrupted config detected - resetting");
log.info("Corrupted config detected - resetting");
return {};
}
} else {