From 6049f6c9aa852c89efdc32dda755ea7f7a7a51fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=90=E9=AA=85?= <luin@users.noreply.github.com>
Date: Sun, 3 Feb 2019 13:49:41 +0800
Subject: [PATCH] fix: add second arg to "node error" to know which node failed
 (#793)

Fixes: #774
---
 README.md                          | 2 +-
 lib/cluster/index.ts               | 9 +++++----
 test/functional/cluster/connect.js | 3 ++-
 test/mocha.opts                    | 1 -
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index fa98ab20..fe49a48d 100644
--- a/README.md
+++ b/README.md
@@ -898,7 +898,7 @@ reconnecting | emits after `close` when a reconnection will be made. The argumen
 end     | emits after `close` when no more reconnections will be made.
 +node   | emits when a new node is connected.
 -node   | emits when a node is disconnected.
-node error | emits when an error occurs when connecting to a node
+node error | emits when an error occurs when connecting to a node. The second argument indicates the address of the node.
 
 ### Password
 Setting the `password` option to access password-protected clusters:
diff --git a/lib/cluster/index.ts b/lib/cluster/index.ts
index 719b95e8..94cf7419 100644
--- a/lib/cluster/index.ts
+++ b/lib/cluster/index.ts
@@ -87,8 +87,8 @@ class Cluster extends EventEmitter {
     this.connectionPool.on('drain', () => {
       this.setStatus('close')
     })
-    this.connectionPool.on('nodeError', (error) => {
-      this.emit('node error', error)
+    this.connectionPool.on('nodeError', (error, key) => {
+      this.emit('node error', error, key)
     })
 
     this.subscriber = new ClusterSubscriber(this.connectionPool, this)
@@ -374,7 +374,8 @@ class Cluster extends EventEmitter {
         return wrapper(error)
       }
       const node = nodes[index]
-      debug('getting slot cache from %s:%s', node.options.host, node.options.port)
+      const key = `${node.options.host}:${node.options.port}`
+      debug('getting slot cache from %s', key)
       _this.getInfoFromNode(node, function (err) {
         switch (_this.status) {
           case 'close':
@@ -384,7 +385,7 @@ class Cluster extends EventEmitter {
             return wrapper(new Error('Cluster is disconnecting.'))
         }
         if (err) {
-          _this.emit('node error', err)
+          _this.emit('node error', err, key)
           lastNodeError = err
           tryNode(index + 1)
         } else {
diff --git a/test/functional/cluster/connect.js b/test/functional/cluster/connect.js
index 4e7f9c14..cafe8904 100644
--- a/test/functional/cluster/connect.js
+++ b/test/functional/cluster/connect.js
@@ -271,8 +271,9 @@ describe('cluster:connect', function () {
       }
     });
 
-    cluster.once('node error', function (err) {
+    cluster.once('node error', function (err, key) {
       expect(err.message).to.eql(errorMessage);
+      expect(['127.0.0.1:30001', '127.0.0.1:30002']).to.include(key)
       checkDone();
     });
 
diff --git a/test/mocha.opts b/test/mocha.opts
index 64935628..3629c7a9 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,3 +1,2 @@
 --reporter spec
 --recursive
---growl