frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Fix debug comms batching with multiple connections

Browse Source
This commit is contained in:
Nick O'Leary 2018-01-28 10:44:02 +00:00
parent 15c3cc60f6
commit dd7bb28b6a
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
red/api/editor/comms.js
View File

@ -70,6 +70,9 @@ function start() {
wsServer.on('connection',function(ws) { wsServer.on('connection',function(ws) {
log.audit({event: "comms.open"}); log.audit({event: "comms.open"});
var pendingAuth = (settings.adminAuth != null); var pendingAuth = (settings.adminAuth != null);
ws._nr_stack = [];
ws._nr_ok2tx = true;
if (!pendingAuth) { if (!pendingAuth) {
activeConnections.push(ws); activeConnections.push(ws);
} else { } else {
@ -190,23 +193,22 @@ function publish(topic,data,retain) {
} }
} }
var stack = [];
var ok2tx = true;
function publishTo(ws,topic,data) { function publishTo(ws,topic,data) {
if (topic && data) { stack.push({topic:topic,data:data}); } if (topic && data) {
ws._nr_stack.push({topic:topic,data:data});
if (ok2tx && (stack.length > 0)) { }
ok2tx = false; if (ws._nr_ok2tx && (ws._nr_stack.length > 0)) {
ws._nr_ok2tx = false;
try { try {
ws.send(JSON.stringify(stack)); ws.send(JSON.stringify(ws._nr_stack));
} catch(err) { } catch(err) {
removeActiveConnection(ws); removeActiveConnection(ws);
removePendingConnection(ws); removePendingConnection(ws);
log.warn(log._("comms.error-send",{message:err.toString()})); log.warn(log._("comms.error-send",{message:err.toString()}));
} }
stack = []; ws._nr_stack = [];
var txtout = setTimeout(function() { setTimeout(function() {
ok2tx = true; ws._nr_ok2tx = true;
publishTo(ws); publishTo(ws);
}, 50); // TODO: OK so a 50mS update rate should prob not be hard-coded }, 50); // TODO: OK so a 50mS update rate should prob not be hard-coded
} }