mirror of
https://github.com/node-red/node-red.git
synced 2025-03-01 10:36:34 +00:00
Move exec and events components to util module
The exec and events components are common components that are used by both runtime and registry. It makes sense to move them into the util package. This also adds some docs to the registry module
This commit is contained in:
@@ -22,15 +22,14 @@ var localfilesystem = require("./localfilesystem");
|
||||
var registry = require("./registry");
|
||||
var registryUtil = require("./util")
|
||||
var i18n = require("@node-red/util").i18n;
|
||||
var log = require("@node-red/util").log;
|
||||
|
||||
var settings;
|
||||
var runtime;
|
||||
|
||||
function init(_runtime) {
|
||||
runtime = _runtime;
|
||||
settings = runtime.settings;
|
||||
localfilesystem.init(runtime);
|
||||
registryUtil.init(runtime);
|
||||
settings = _runtime.settings;
|
||||
localfilesystem.init(settings);
|
||||
registryUtil.init(_runtime);
|
||||
}
|
||||
|
||||
function load(disableNodePathScan) {
|
||||
@@ -38,7 +37,7 @@ function load(disableNodePathScan) {
|
||||
// We should expose that as an option at some point, although the
|
||||
// performance gains are minimal.
|
||||
//return loadNodeFiles(registry.getModuleList());
|
||||
runtime.log.info(runtime.log._("server.loading"));
|
||||
log.info(log._("server.loading"));
|
||||
|
||||
var nodeFiles = localfilesystem.getNodeFiles(disableNodePathScan);
|
||||
return loadNodeFiles(nodeFiles);
|
||||
@@ -51,9 +50,9 @@ function loadNodeFiles(nodeFiles) {
|
||||
/* istanbul ignore else */
|
||||
if (nodeFiles.hasOwnProperty(module)) {
|
||||
if (nodeFiles[module].redVersion &&
|
||||
!semver.satisfies(runtime.version().replace(/(\-[1-9A-Za-z-][0-9A-Za-z-\.]*)?(\+[0-9A-Za-z-\.]+)?$/,""), nodeFiles[module].redVersion)) {
|
||||
!semver.satisfies((settings.version||"0.0.0").replace(/(\-[1-9A-Za-z-][0-9A-Za-z-\.]*)?(\+[0-9A-Za-z-\.]+)?$/,""), nodeFiles[module].redVersion)) {
|
||||
//TODO: log it
|
||||
runtime.log.warn("["+module+"] "+runtime.log._("server.node-version-mismatch",{version:nodeFiles[module].redVersion}));
|
||||
log.warn("["+module+"] "+log._("server.node-version-mismatch",{version:nodeFiles[module].redVersion}));
|
||||
nodeFiles[module].err = "version_mismatch";
|
||||
continue;
|
||||
}
|
||||
|
Reference in New Issue
Block a user