1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

add logging of context store

This commit is contained in:
Hiroyasu Nishiyama 2018-07-19 07:40:52 +09:00
parent cecea318da
commit 31ee1be81e
9 changed files with 104 additions and 4 deletions

View File

@ -163,6 +163,7 @@ function start() {
if (settings.httpStatic) { if (settings.httpStatic) {
log.info(log._("runtime.paths.httpStatic",{path:path.resolve(settings.httpStatic)})); log.info(log._("runtime.paths.httpStatic",{path:path.resolve(settings.httpStatic)}));
} }
redNodes.logContextStores();
redNodes.loadFlows().then(redNodes.startFlows).catch(function(err) {}); redNodes.loadFlows().then(redNodes.startFlows).catch(function(err) {});
started = true; started = true;
}).catch(function(err) { }).catch(function(err) {

View File

@ -163,7 +163,9 @@
"error-module-not-defined": "'module' is not defined in '__storage__' of settings.contextStorage", "error-module-not-defined": "'module' is not defined in '__storage__' of settings.contextStorage",
"error-invalid-module-name": "Invalid context store name: '__name__'", "error-invalid-module-name": "Invalid context store name: '__name__'",
"error-invalid-default-module": "Invalid storage '__storage__' is specified as a default storage", "error-invalid-default-module": "Invalid storage '__storage__' is specified as a default storage",
"error-use-undefined-storage": "Undefined storage '__storage__' is specified" "error-use-undefined-storage": "Undefined storage '__storage__' is specified",
"unknown-store": "Unknown store '__name__' specified. Use default store instead.",
"log-store-init": "Context store : '__name__' [__info__]"
} }
} }

View File

@ -31,6 +31,27 @@ var defaultStore;
// Whether there context storage has been configured or left as default // Whether there context storage has been configured or left as default
var hasConfiguredStore = false; var hasConfiguredStore = false;
// Unknown Stores
var unknownStores = {};
function logUnknownStore(name) {
var count = unknownStores[name] || 0;
if (count == 0) {
log.warn(log._("context.unknown-store", {name: name}));
count++;
unknownStores[name] = count;
}
}
function logStores() {
for(var name in stores) {
if (name !== '_') { // ignore default store
var plugin = stores[name];
log.info(log._("context.log-store-init",
{name:name, info:plugin.info() }));
}
}
}
function init(_settings) { function init(_settings) {
settings = _settings; settings = _settings;
@ -158,6 +179,7 @@ function getContextStorage(storage) {
return stores[storage]; return stores[storage];
} else if (stores.hasOwnProperty("_")) { } else if (stores.hasOwnProperty("_")) {
// Not known, but we have a default to fall back to // Not known, but we have a default to fall back to
logUnknownStore(storage);
return stores["_"]; return stores["_"];
} else { } else {
// Not known and no default configured // Not known and no default configured
@ -402,5 +424,6 @@ module.exports = {
get: getContext, get: getContext,
delete: deleteContext, delete: deleteContext,
clean: clean, clean: clean,
close: close close: close,
logStores: logStores
}; };

View File

@ -267,6 +267,24 @@ LocalFileSystem.prototype.clean = function(activeNodes){
}); });
} }
LocalFileSystem.prototype.info = function() {
var self = this;
var conf = self.config;
var info = "module=localfilesystem";
if (conf) {
if (conf.hasOwnProperty("base")) {
info += ",base='"+conf.base+"'";
}
if (conf.hasOwnProperty("dir")) {
info += ",dir='"+conf.dir+"'";
}
if (conf.hasOwnProperty("cache")) {
info += ",cache";
}
}
return info;
}
module.exports = function(config){ module.exports = function(config){
return new LocalFileSystem(config); return new LocalFileSystem(config);
}; };

View File

@ -124,6 +124,12 @@ Memory.prototype._export = function() {
return this.data; return this.data;
} }
Memory.prototype.info = function() {
var self = this;
var conf = self.config;
var info = "module=memory";
return info;
}
module.exports = function(config){ module.exports = function(config){
return new Memory(config); return new Memory(config);

View File

@ -223,5 +223,6 @@ module.exports = {
// Contexts // Contexts
loadContextsPlugin: context.load, loadContextsPlugin: context.load,
closeContextsPlugin: context.close, closeContextsPlugin: context.close,
listContextStores: context.listStores listContextStores: context.listStores,
logContextStores: context.logStores
}; };

View File

@ -18,6 +18,7 @@ var should = require("should");
var sinon = require('sinon'); var sinon = require('sinon');
var path = require("path"); var path = require("path");
var Context = require("../../../../../red/runtime/nodes/context/index"); var Context = require("../../../../../red/runtime/nodes/context/index");
var Log = require("../../../../../red/runtime/log");
describe('context', function() { describe('context', function() {
describe('local memory',function() { describe('local memory',function() {
@ -792,4 +793,37 @@ describe('context', function() {
}); });
}); });
}); });
describe('log', function() {
it('should log context store info', function(done) {
Context.init({
contextStorage: {
memory: {
module: "memory",
congig: {
}
}
}
});
Context.load().then(function() {
var loginfo = undefined;
var logmsg = undefined;
sinon.stub(Log, 'log', function(msg) {
loginfo = msg;
});
sinon.stub(Log, '_', function(msg, info) {
logmsg = JSON.stringify(info);
return logmsg;
});
Context.logStores();
should.deepEqual(loginfo, {
level: Log.INFO,
msg: logmsg
});
Log.log.restore();
Log._.restore();
done();
});
});
});
}); });

View File

@ -376,7 +376,7 @@ describe('localfilesystem',function() {
}); });
}); });
describe('if cache is enabled',function() { describe('#if cache is enabled',function() {
afterEach(function() { afterEach(function() {
return context.clean([]).then(function(){ return context.clean([]).then(function(){
return context.close().then(function(){ return context.close().then(function(){
@ -496,4 +496,12 @@ describe('localfilesystem',function() {
}); });
}); });
}); });
describe('#info', function() {
it('should return info', function() {
var context = LocalFileSystem({dir: "/tmp", base: "xyz", cache: true});
var info = context.info();
info.should.be.equal("module=localfilesystem,base='xyz',dir='/tmp',cache");
});
});
}); });

View File

@ -214,4 +214,11 @@ describe('memory',function() {
}); });
}); });
describe('#info',function() {
it('should return info', function() {
var info = context.info();
info.should.be.equal("module=memory");
});
});
}); });