diff --git a/red/runtime/locales/en-US/runtime.json b/red/runtime/locales/en-US/runtime.json index 93befe02a..a4f9840a3 100644 --- a/red/runtime/locales/en-US/runtime.json +++ b/red/runtime/locales/en-US/runtime.json @@ -13,6 +13,7 @@ "errors_plural": "Failed to register __count__ node types", "errors-help": "Run with -v for details", "missing-modules": "Missing node modules:", + "node-version-mismatch": "Node module cannot be loaded on this version. Requires: __version__ ", "removing-modules": "Removing modules from config", "added-types": "Added node types:", "removed-types": "Removed node types:", diff --git a/red/runtime/nodes/index.js b/red/runtime/nodes/index.js index 17b5c7d47..f39e6c3cc 100644 --- a/red/runtime/nodes/index.js +++ b/red/runtime/nodes/index.js @@ -42,7 +42,7 @@ function registerType(nodeSet,type,constructor,opts) { if (typeof type !== "string") { // This is someone calling the api directly, rather than via the // RED object provided to a node. Log a warning - log.warn("Deprecated call to RED.runtime.nodes.registerType - node-set name must be provided as first argument"); + log.warn("["+nodeSet+"] Deprecated call to RED.runtime.nodes.registerType - node-set name must be provided as first argument"); opts = constructor; constructor = type; type = nodeSet; diff --git a/red/runtime/nodes/registry/loader.js b/red/runtime/nodes/registry/loader.js index d160a561a..9e5897593 100644 --- a/red/runtime/nodes/registry/loader.js +++ b/red/runtime/nodes/registry/loader.js @@ -115,6 +115,7 @@ function loadNodeFiles(nodeFiles) { if (nodeFiles[module].redVersion && !semver.satisfies(runtime.version().replace("-git",""), nodeFiles[module].redVersion)) { //TODO: log it + runtime.log.warn("["+module+"] "+runtime.log._("server.node-version-mismatch",{version:nodeFiles[module].redVersion})); continue; } if (module == "node-red" || !registry.getModuleInfo(module)) { diff --git a/test/red/runtime/nodes/registry/loader_spec.js b/test/red/runtime/nodes/registry/loader_spec.js index bf8589ae8..bebb86b51 100644 --- a/test/red/runtime/nodes/registry/loader_spec.js +++ b/test/red/runtime/nodes/registry/loader_spec.js @@ -424,7 +424,7 @@ describe("red/nodes/registry/loader",function() { stubs.push(sinon.stub(registry,"saveNodeList", function(){ return "a node list" })); stubs.push(sinon.stub(registry,"addNodeSet", function(){ return })); stubs.push(sinon.stub(nodes,"registerType")); - loader.init({nodes:nodes,i18n:{defaultLang:"en-US"},events:{on:function(){},removeListener:function(){}},version: function() { return "0.12.0"}, settings:{available:function(){return true;}}}); + loader.init({log:{"_":function(){},warn:function(){}},nodes:nodes,i18n:{defaultLang:"en-US"},events:{on:function(){},removeListener:function(){}},version: function() { return "0.12.0"}, settings:{available:function(){return true;}}}); loader.addModule("TestNodeModule").then(function(result) { result.should.eql("a node list"); registry.addNodeSet.called.should.be.false;