From 1bd07acbd1891677815235ecb0c59b28eb519755 Mon Sep 17 00:00:00 2001 From: Claudio Rodriguez Date: Tue, 11 Apr 2017 10:39:25 +0100 Subject: [PATCH] net: refactor onSlaveClose in Server.close Refactors onSlaveClose in Server.close to be an arrow function, removes need for `self = this` and moves it down to make code more readable. PR-URL: https://github.com/nodejs/node/pull/12334 Reviewed-By: Evan Lucas Reviewed-By: James M Snell Reviewed-By: Colin Ihrig Reviewed-By: Luigi Pinca Reviewed-By: Yuta Hiroto --- lib/net.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/net.js b/lib/net.js index b04c65abd6fab6..5e653c61d2106c 100644 --- a/lib/net.js +++ b/lib/net.js @@ -1495,13 +1495,6 @@ Server.prototype.getConnections = function(cb) { Server.prototype.close = function(cb) { - function onSlaveClose() { - if (--left !== 0) return; - - self._connections = 0; - self._emitCloseIfDrained(); - } - if (typeof cb === 'function') { if (!this._handle) { this.once('close', function() { @@ -1518,8 +1511,13 @@ Server.prototype.close = function(cb) { } if (this._usingSlaves) { - var self = this; var left = this._slaves.length; + const onSlaveClose = () => { + if (--left !== 0) return; + + this._connections = 0; + this._emitCloseIfDrained(); + }; // Increment connections to be sure that, even if all sockets will be closed // during polling of slaves, `close` event will be emitted only once.