From 588b48ed3c0e80a40e4def68415b60639612b6b6 Mon Sep 17 00:00:00 2001 From: Matthias Goetzke Date: Tue, 11 Mar 2014 10:52:57 +0100 Subject: [PATCH] corrected consume and reliable fetch when hitting end of queue --- lib/kestrelClient.js | 1 + lib/kestrelConsumer.js | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/kestrelClient.js b/lib/kestrelClient.js index 7a44a64..2acbf20 100644 --- a/lib/kestrelClient.js +++ b/lib/kestrelClient.js @@ -123,6 +123,7 @@ function _handleData(data, self){ if( data == 'END\r\n' ){ + self._openConnection = null; self.emit('empty', null); } diff --git a/lib/kestrelConsumer.js b/lib/kestrelConsumer.js index 8c8c2b9..6c70d1c 100644 --- a/lib/kestrelConsumer.js +++ b/lib/kestrelConsumer.js @@ -37,12 +37,12 @@ function connectToClient(self){ self.consume(consumeOptions,consumeCallback); }); } else { - self._consumeNextMessage(); + self._getNextMessage(); } }); } else { self._callback(message); - self._consumeNextMessage(); + self._getNextMessage(); } } @@ -50,7 +50,7 @@ function connectToClient(self){ }); client.on('empty', function(){ - self.get(self._timeout); + self._getNextMessage(); }); return client; @@ -88,10 +88,10 @@ consumer.prototype.consume = function( options, callback ){ this._callback = callback; this._consume = options; - this._consumeNextMessage(); + this._getNextMessage(); }; -consumer.prototype._consumeNextMessage = function(){ +consumer.prototype._getNextMessage = function(){ if(this._consume.reliable){ this.getNextOpen(this._timeout); } else {