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

stop delay node spamming web socket (when in fast rate limit mode)

Browse Source
This commit is contained in:
Dave Conway-Jones 2017-06-09 19:42:12 +01:00
parent f688b8d299
commit d407f31ae5
No known key found for this signature in database
GPG Key ID: 81B04231572A9A2D
2 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nodes/core/core/89-delay.js
View File

@ -126,16 +126,14 @@ module.exports = function(RED) {
if (!node.drop) { if (!node.drop) {
if ( node.intervalID !== -1) { if ( node.intervalID !== -1) {
node.buffer.push(msg); node.buffer.push(msg);
if (node.buffer.length > 0) { if ((node.rate >= 200) && (node.buffer.length > 0)) {
node.status({text:node.buffer.length}); node.status({text:node.buffer.length});
} }
if ((node.buffer.length > 1000) && (olddepth < 1000)) { else {
olddepth = 1000; if (!olddepth) {
node.warn(node.name + " " + RED._("delay.error.buffer")); node.status({fill:"blue",shape:"dot"});
olddepth = 1;
} }
if ((node.buffer.length > 10000) && (olddepth < 10000)) {
olddepth = 10000;
node.warn(node.name + " " + RED._("delay.error.buffer1"));
} }
} }
else { else {
@ -145,11 +143,10 @@ module.exports = function(RED) {
clearInterval(node.intervalID); clearInterval(node.intervalID);
node.intervalID = -1; node.intervalID = -1;
node.status({}); node.status({});
olddepth = 0;
} }
if (node.buffer.length > 0) { if (node.buffer.length > 0) {
node.send(node.buffer.shift()); node.send(node.buffer.shift());
if (node.buffer.length < 1000) { olddepth = 0; }
node.status({text:node.buffer.length});
} }
},node.rate); },node.rate);
} }

34
test/nodes/core/core/89-delay_spec.js
View File

@ -484,40 +484,6 @@ describe('delay Node', function() {
randomDelayTest(0.0000046296, 0.0000092593, "days", done); randomDelayTest(0.0000046296, 0.0000092593, "days", done);
}); });
it('handles bursts using a buffer', function(done) {
this.timeout(10000);
var flow = [{"id":"delayNode1","type":"delay","name":"delayNode","pauseType":"rate","timeout":5,"timeoutUnits":"seconds","rate":1000,"rateUnits":"second","randomFirst":"1","randomLast":"5","randomUnits":"seconds","drop":false,"wires":[["helperNode1"]]},
{id:"helperNode1", type:"helper", wires:[]}];
helper.load(delayNode, flow, function() {
var delayNode1 = helper.getNode("delayNode1");
var helperNode1 = helper.getNode("helperNode1");
var sinon = require('sinon');
var receivedWarning = false;
var messageBurstSize = 1200;
// we ensure that we note that a warning is received for buffer growth
sinon.stub(delayNode1, 'warn', function(warning) {
receivedWarning = true;
});
// we ensure that the warning is received for buffer size and that we get the last message
helperNode1.on("input", function(msg) {
if (msg.payload === (messageBurstSize - 1)) {
try {
receivedWarning.should.be.true();
done();
} catch(err) {
done(err);
}
}
});
// send messages as quickly as possible
for (var i = 0; i < messageBurstSize; i++) {
delayNode1.receive({payload:i});
}
});
});
it('handles delay queue', function(done) { it('handles delay queue', function(done) {
this.timeout(2000); this.timeout(2000);
var flow = [{id:"delayNode1", type :"delay","name":"delayNode","nbRateUnits":"1","pauseType":"queue","timeout":1,"timeoutUnits":"seconds","rate":4,"rateUnits":"second","randomFirst":"1","randomLast":"5","randomUnits":"seconds","drop":false,"wires":[["helperNode1"]]}, var flow = [{id:"delayNode1", type :"delay","name":"delayNode","nbRateUnits":"1","pauseType":"queue","timeout":1,"timeoutUnits":"seconds","rate":4,"rateUnits":"second","randomFirst":"1","randomLast":"5","randomUnits":"seconds","drop":false,"wires":[["helperNode1"]]},