habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #298 from spalger/fix/leakingTimesInTransport

Browse Source 
Fix/leaking times in transport
This commit is contained in:
Spencer
2015-11-16 15:53:32 -06:00
parent 661464eeec 5d3803d224
commit 4af41ecf40
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/transport.js
View File

@ -319,8 +319,10 @@ Transport.prototype.request = function (params, cb) {
};
Transport.prototype._timeout = function (cb, delay) {
this._timers = this._timers || [];
if (this.closed) return;
var id;
var timers = this._timers || (this._timers = []);
if ('function' !== typeof cb) {
id = cb;
@ -329,8 +331,12 @@ Transport.prototype._timeout = function (cb, delay) {
if (cb) {
// set the timer
id = setTimeout(cb, delay);
this._timers.push(id);
id = setTimeout(function () {
_.pull(timers, id);
cb();
}, delay);
timers.push(id);
return id;
}
@ -393,6 +399,8 @@ Transport.prototype.sniff = function (cb) {
*/
Transport.prototype.close = function () {
this.log.close();
this.closed = true;
_.each(this._timers, clearTimeout);
this._timers = null;
this.connectionPool.close();
};