frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up runtime tests

Browse Source
This commit is contained in:
Nick O'Leary
2018-04-23 14:24:51 +01:00
parent e3b1179a21
commit 34832d5942
15 changed files with 144 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
red/runtime/nodes/flows/Flow.js
View File

@@ -17,7 +17,7 @@
var when = require("when");
var clone = require("clone");
var typeRegistry = require("../registry");
var Log = require("../../../util").log; // TODO: separate module
var Log;
var redUtil = require("../../util");
var flowUtil = require("./util");
@@ -495,8 +495,9 @@ function createSubflow(sf,sfn,subflows,globalSubflows,activeNodes) {
module.exports = {
init: function(settings) {
nodeCloseTimeout = settings.nodeCloseTimeout || 15000;
init: function(runtime) {
nodeCloseTimeout = runtime.settings.nodeCloseTimeout || 15000;
Log = runtime.log;
},
create: function(global,conf) {
return new Flow(global,conf);

5
red/runtime/nodes/flows/index.js
View File

@@ -24,7 +24,7 @@ var context = require("../context")
var credentials = require("../credentials");
var flowUtil = require("./util");
var log = require("../../../util").log; // TODO: separate module
var log;
var events = require("../../events");
var redUtil = require("../../util");
var deprecated = require("../registry/deprecated");
@@ -50,6 +50,7 @@ function init(runtime) {
}
settings = runtime.settings;
storage = runtime.storage;
log = runtime.log;
started = false;
if (!typeEventRegistered) {
events.on('type-registered',function(type) {
@@ -67,7 +68,7 @@ function init(runtime) {
});
typeEventRegistered = true;
}
Flow.init(settings);
Flow.init(runtime);
}
function loadFlows() {