From 70147d0b6b3c9c64fc758960d6e576707d0fba16 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 30 May 2014 20:30:26 +0100 Subject: [PATCH] Remove 'retined' property from node.status calls --- nodes/core/hardware/35-arduino.js | 8 ++++---- nodes/core/io/10-mqtt.js | 10 +++++----- nodes/core/io/25-serial.js | 10 +++++----- nodes/core/io/31-tcpin.js | 10 +++++----- nodes/core/social/61-email.js | 22 +++++++++++----------- red/nodes/Node.js | 4 ++-- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/nodes/core/hardware/35-arduino.js b/nodes/core/hardware/35-arduino.js index a9295b620..4b2e4470e 100644 --- a/nodes/core/hardware/35-arduino.js +++ b/nodes/core/hardware/35-arduino.js @@ -59,10 +59,10 @@ module.exports = function(RED) { this.board = this.serverConfig.board; //this.repeat = this.serverConfig.repeat; var node = this; - node.status({fill:"red",shape:"ring",text:"connecting"},true); + node.status({fill:"red",shape:"ring",text:"connecting"}); node.board.on('connect', function() { - node.status({fill:"green",shape:"dot",text:"connected"},true); + node.status({fill:"green",shape:"dot",text:"connected"}); //console.log("i",node.state,node.pin); if (node.state == "ANALOG") { node.board.on('analogChange', function(e) { @@ -102,10 +102,10 @@ module.exports = function(RED) { if (typeof this.serverConfig === "object") { this.board = this.serverConfig.board; var node = this; - node.status({fill:"red",shape:"ring",text:"connecting"},true); + node.status({fill:"red",shape:"ring",text:"connecting"}); node.board.on('connect', function() { - node.status({fill:"green",shape:"dot",text:"connected"},true); + node.status({fill:"green",shape:"dot",text:"connected"}); //console.log("o",node.state,node.pin); node.board.pinMode(node.pin, node.state); node.on("input", function(msg) { diff --git a/nodes/core/io/10-mqtt.js b/nodes/core/io/10-mqtt.js index 3ecbb86e9..737dd39aa 100644 --- a/nodes/core/io/10-mqtt.js +++ b/nodes/core/io/10-mqtt.js @@ -79,7 +79,7 @@ module.exports = function(RED) { this.brokerConfig = RED.nodes.getNode(this.broker); var node = this; if (this.brokerConfig) { - this.status({fill:"red",shape:"ring",text:"disconnected"},true); + this.status({fill:"red",shape:"ring",text:"disconnected"}); this.client = connectionPool.get(this.brokerConfig.broker,this.brokerConfig.port,this.brokerConfig.clientid,this.brokerConfig.username,this.brokerConfig.password); var node = this; this.client.subscribe(this.topic,2,function(topic,payload,qos,retain) { @@ -90,10 +90,10 @@ module.exports = function(RED) { node.send(msg); }); this.client.on("connectionlost",function() { - node.status({fill:"red",shape:"ring",text:"disconnected"},true); + node.status({fill:"red",shape:"ring",text:"disconnected"}); }); this.client.on("connect",function() { - node.status({fill:"green",shape:"dot",text:"connected"},true); + node.status({fill:"green",shape:"dot",text:"connected"}); }); this.client.connect(); } else { @@ -131,10 +131,10 @@ module.exports = function(RED) { } }); this.client.on("connectionlost",function() { - node.status({fill:"red",shape:"ring",text:"disconnected"},true); + node.status({fill:"red",shape:"ring",text:"disconnected"}); }); this.client.on("connect",function() { - node.status({fill:"green",shape:"dot",text:"connected"},true); + node.status({fill:"green",shape:"dot",text:"connected"}); }); this.client.connect(); diff --git a/nodes/core/io/25-serial.js b/nodes/core/io/25-serial.js index bd2370a7d..8594eb8b7 100644 --- a/nodes/core/io/25-serial.js +++ b/nodes/core/io/25-serial.js @@ -71,10 +71,10 @@ module.exports = function(RED) { }); }); node.port.on('ready', function() { - node.status({fill:"green",shape:"dot",text:"connected"},true); + node.status({fill:"green",shape:"dot",text:"connected"}); }); node.port.on('closed', function() { - node.status({fill:"red",shape:"ring",text:"not connected"},true); + node.status({fill:"red",shape:"ring",text:"not connected"}); }); } else { this.error("missing serial config"); @@ -97,7 +97,7 @@ module.exports = function(RED) { if (this.serialConfig) { var node = this; - node.status({fill:"grey",shape:"dot",text:"unknown"},true); + node.status({fill:"grey",shape:"dot",text:"unknown"}); node.port = serialPool.get(this.serialConfig.serialport, this.serialConfig.serialbaud, this.serialConfig.databits, @@ -108,10 +108,10 @@ module.exports = function(RED) { node.send({ "payload": msg }); }); this.port.on('ready', function() { - node.status({fill:"green",shape:"dot",text:"connected"},true); + node.status({fill:"green",shape:"dot",text:"connected"}); }); this.port.on('closed', function() { - node.status({fill:"red",shape:"ring",text:"not connected"},true); + node.status({fill:"red",shape:"ring",text:"not connected"}); }); } else { this.error("missing serial config"); diff --git a/nodes/core/io/31-tcpin.js b/nodes/core/io/31-tcpin.js index 004b46c3d..44dcfab92 100644 --- a/nodes/core/io/31-tcpin.js +++ b/nodes/core/io/31-tcpin.js @@ -41,12 +41,12 @@ module.exports = function(RED) { var reconnectTimeout; var setupTcpClient = function() { node.log("connecting to "+node.host+":"+node.port); - node.status({fill:"grey",shape:"dot",text:"connecting"},true); + node.status({fill:"grey",shape:"dot",text:"connecting"}); var id = (1+Math.random()*4294967295).toString(16); client = net.connect(node.port, node.host, function() { buffer = (node.datatype == 'buffer')? new Buffer(0):""; node.log("connected to "+node.host+":"+node.port); - node.status({fill:"green",shape:"dot",text:"connected"},true); + node.status({fill:"green",shape:"dot",text:"connected"}); }); connectionPool[id] = client; @@ -198,11 +198,11 @@ module.exports = function(RED) { var setupTcpClient = function() { node.log("connecting to "+node.host+":"+node.port); - node.status({fill:"grey",shape:"dot",text:"connecting"},true); + node.status({fill:"grey",shape:"dot",text:"connecting"}); client = net.connect(node.port, node.host, function() { connected = true; node.log("connected to "+node.host+":"+node.port); - node.status({fill:"green",shape:"dot",text:"connected"},true); + node.status({fill:"green",shape:"dot",text:"connected"}); }); client.on('error', function (err) { node.log('error : '+err); @@ -211,7 +211,7 @@ module.exports = function(RED) { }); client.on('close', function() { node.log("connection lost to "+node.host+":"+node.port); - node.status({fill:"red",shape:"ring",text:"disconnected"},true); + node.status({fill:"red",shape:"ring",text:"disconnected"}); connected = false; client.destroy(); if (!node.closing) { diff --git a/nodes/core/social/61-email.js b/nodes/core/social/61-email.js index 3ffd886e4..30c6f66e8 100644 --- a/nodes/core/social/61-email.js +++ b/nodes/core/social/61-email.js @@ -69,7 +69,7 @@ module.exports = function(RED) { this.on("input", function(msg) { if (msg != null) { - node.status({fill:"blue",shape:"dot",text:"sending"},true); + node.status({fill:"blue",shape:"dot",text:"sending"}); if (smtpTransport) { smtpTransport.sendMail({ from: node.userid, // sender address @@ -79,10 +79,10 @@ module.exports = function(RED) { }, function(error, response) { if (error) { node.error(error); - node.status({fill:"red",shape:"ring",text:"post error"},true); + node.status({fill:"red",shape:"ring",text:"post error"}); } else { node.log("Message sent: " + response.message); - node.status({},true); + node.status({}); } }); } @@ -135,7 +135,7 @@ module.exports = function(RED) { this.on("input", function(msg) { imap.once('ready', function() { - node.status({fill:"blue",shape:"dot",text:"fetching"},true); + node.status({fill:"blue",shape:"dot",text:"fetching"}); var pay = {}; imap.openBox('INBOX', true, function(err, box) { if (box.messages.total > 0) { @@ -173,7 +173,7 @@ module.exports = function(RED) { }); f.on('error', function(err) { node.warn('fetch error: ' + err); - node.status({fill:"red",shape:"ring",text:"fetch error"},true); + node.status({fill:"red",shape:"ring",text:"fetch error"}); }); f.on('end', function() { if (JSON.stringify(pay) !== oldmail) { @@ -182,26 +182,26 @@ module.exports = function(RED) { node.log('received new email: '+pay.topic); } else { node.log('duplicate not sent: '+pay.topic); } - //node.status({fill:"green",shape:"dot",text:"ok"},true); - node.status({},true); + //node.status({fill:"green",shape:"dot",text:"ok"}); + node.status({}); imap.end(); }); } else { node.log("you have achieved inbox zero"); - //node.status({fill:"green",shape:"dot",text:"ok"},true); - node.status({},true); + //node.status({fill:"green",shape:"dot",text:"ok"}); + node.status({}); imap.end(); } }); }); - node.status({fill:"grey",shape:"dot",text:"connecting"},true); + node.status({fill:"grey",shape:"dot",text:"connecting"}); imap.connect(); }); imap.on('error', function(err) { node.log(err); - node.status({fill:"red",shape:"ring",text:"connect error"},true); + node.status({fill:"red",shape:"ring",text:"connect error"}); }); this.on("error", function(err) { diff --git a/red/nodes/Node.js b/red/nodes/Node.js index c0a921d9d..99d6df579 100644 --- a/red/nodes/Node.js +++ b/red/nodes/Node.js @@ -137,7 +137,7 @@ Node.prototype.error = function(msg) { /** * status: { fill:"red|green", shape:"dot|ring", text:"blah" } */ -Node.prototype.status = function(status,retain) { - comms.publish("status/"+this.id,status,retain); +Node.prototype.status = function(status) { + comms.publish("status/"+this.id,status,true); } module.exports = Node;