From 227db0ab219fba7a0c6c6dae3cb931ca2ecff896 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Wed, 13 Jul 2016 11:18:31 -0400
Subject: [PATCH] cluster: remove bind() and self
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit removes the use of self and bind() from the cluster
module in favor of arrow functions.

PR-URL: https://github.com/nodejs/node/pull/7710
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
---
 lib/cluster.js | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/lib/cluster.js b/lib/cluster.js
index 8e8bdefadf03c7..3a66e4891d1a43 100644
--- a/lib/cluster.js
+++ b/lib/cluster.js
@@ -114,12 +114,11 @@ function RoundRobinHandle(key, address, port, addressType, backlog, fd) {
   else
     this.server.listen(address);  // UNIX socket path.
 
-  var self = this;
-  this.server.once('listening', function() {
-    self.handle = self.server._handle;
-    self.handle.onconnection = self.distribute.bind(self);
-    self.server._handle = null;
-    self.server = null;
+  this.server.once('listening', () => {
+    this.handle = this.server._handle;
+    this.handle.onconnection = (err, handle) => this.distribute(err, handle);
+    this.server._handle = null;
+    this.server = null;
   });
 }
 
@@ -127,18 +126,17 @@ RoundRobinHandle.prototype.add = function(worker, send) {
   assert(worker.id in this.all === false);
   this.all[worker.id] = worker;
 
-  var self = this;
-  function done() {
-    if (self.handle.getsockname) {
+  const done = () => {
+    if (this.handle.getsockname) {
       var out = {};
-      self.handle.getsockname(out);
+      this.handle.getsockname(out);
       // TODO(bnoordhuis) Check err.
       send(null, { sockname: out }, null);
     } else {
       send(null, null, null);  // UNIX socket.
     }
-    self.handoff(worker);  // In case there are connections pending.
-  }
+    this.handoff(worker);  // In case there are connections pending.
+  };
 
   if (this.server === null) return done();
   // Still busy binding.
@@ -180,13 +178,13 @@ RoundRobinHandle.prototype.handoff = function(worker) {
     return;
   }
   var message = { act: 'newconn', key: this.key };
-  var self = this;
-  sendHelper(worker.process, message, handle, function(reply) {
+
+  sendHelper(worker.process, message, handle, (reply) => {
     if (reply.accepted)
       handle.close();
     else
-      self.distribute(0, handle);  // Worker is shutting down. Send to another.
-    self.handoff(worker);
+      this.distribute(0, handle);  // Worker is shutting down. Send to another.
+    this.handoff(worker);
   });
 };
 
@@ -399,7 +397,7 @@ function masterInit() {
   cluster.disconnect = function(cb) {
     var workers = Object.keys(cluster.workers);
     if (workers.length === 0) {
-      process.nextTick(intercom.emit.bind(intercom, 'disconnect'));
+      process.nextTick(() => intercom.emit('disconnect'));
     } else {
       for (var key in workers) {
         key = workers[key];
@@ -421,7 +419,7 @@ function masterInit() {
     signo = signo || 'SIGTERM';
     var proc = this.process;
     if (this.isConnected()) {
-      this.once('disconnect', proc.kill.bind(proc, signo));
+      this.once('disconnect', () => proc.kill(signo));
       this.disconnect();
       return;
     }