mirror of
https://github.com/node-red/node-red.git
synced 2025-03-01 10:36:34 +00:00
Fix node enable/disable over restart - load configs after settings init
This commit is contained in:
@@ -29,7 +29,12 @@ function init(runtime) {
|
||||
settings = runtime.settings;
|
||||
installer.init(runtime.settings);
|
||||
loader.init(runtime);
|
||||
registry.init(runtime.settings,loader);
|
||||
registry.init(settings,loader);
|
||||
}
|
||||
|
||||
function load() {
|
||||
registry.load();
|
||||
return loader.load();
|
||||
}
|
||||
|
||||
function addModule(module) {
|
||||
@@ -52,7 +57,7 @@ function enableNodeSet(typeOrId) {
|
||||
|
||||
module.exports = {
|
||||
init:init,
|
||||
load:loader.load,
|
||||
load:load,
|
||||
clear: registry.clear,
|
||||
registerType: registry.registerNodeConstructor,
|
||||
|
||||
|
@@ -35,11 +35,6 @@ var moduleNodes = {};
|
||||
function init(_settings,_loader) {
|
||||
settings = _settings;
|
||||
loader = _loader;
|
||||
if (settings.available()) {
|
||||
moduleConfigs = loadNodeConfigs();
|
||||
} else {
|
||||
moduleConfigs = {};
|
||||
}
|
||||
moduleNodes = {};
|
||||
nodeTypeToId = {};
|
||||
nodeConstructors = {};
|
||||
@@ -48,6 +43,14 @@ function init(_settings,_loader) {
|
||||
Node = require("../Node");
|
||||
}
|
||||
|
||||
function load() {
|
||||
if (settings.available()) {
|
||||
moduleConfigs = loadNodeConfigs();
|
||||
} else {
|
||||
moduleConfigs = {};
|
||||
}
|
||||
}
|
||||
|
||||
function filterNodeInfo(n) {
|
||||
var r = {
|
||||
id: n.id||n.module+"/"+n.name,
|
||||
@@ -535,6 +538,7 @@ function cleanModuleList() {
|
||||
|
||||
var registry = module.exports = {
|
||||
init: init,
|
||||
load: load,
|
||||
clear: clear,
|
||||
|
||||
registerNodeConstructor: registerNodeConstructor,
|
||||
|
Reference in New Issue
Block a user