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 merge conflicts

Browse Source
This commit is contained in:
Nick O'Leary
2017-01-05 10:07:23 +00:00
parent db2425c473 83acb66f00
commit 59ffacb3df
64 changed files with 7993 additions and 1140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
red/runtime/index.js
View File

@@ -92,7 +92,7 @@ function start() {
reportMetrics();
}, settings.runtimeMetricInterval||15000);
}
console.log("\n\n"+log._("runtime.welcome")+"\n===================\n");
log.info("\n\n"+log._("runtime.welcome")+"\n===================\n");
if (settings.version) {
log.info(log._("runtime.version",{component:"Node-RED",version:"v"+settings.version}));
}

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

@@ -58,6 +58,7 @@ function init(runtime) {
log.info(log._("nodes.flows.registered-missing", {type:type}));
activeFlowConfig.missingTypes.splice(i,1);
if (activeFlowConfig.missingTypes.length === 0 && started) {
events.emit("runtime-event",{id:"runtime-state"});
start();
}
}
@@ -238,6 +239,7 @@ function start(type,diff,muteLog) {
log.info(log._("nodes.flows.missing-type-install-2"));
log.info(" "+settings.userDir);
}
events.emit("runtime-event",{id:"runtime-state",type:"warning",text:"notification.warnings.missing-types"});
return when.resolve();
}
if (!muteLog) {
@@ -287,6 +289,8 @@ function start(type,diff,muteLog) {
}
}
events.emit("nodes-started");
events.emit("runtime-event",{id:"runtime-state"});
if (!muteLog) {
if (diff) {
log.info(log._("nodes.flows.started-modified-"+type));

3
red/runtime/util.js
View File

@@ -15,6 +15,7 @@
**/
var clone = require("clone");
var jsonata = require("jsonata");
function generateId() {
return (1+Math.random()*4294967295).toString(16);
@@ -310,6 +311,8 @@ function evaluateNodeProperty(value, type, node, msg) {
return node.context().global.get(value);
} else if (type === 'bool') {
return /^true$/i.test(value);
} else if (type === 'jsonata') {
return jsonata(value).evaluate({msg:msg});
}
return value;
}