net: reset `errorEmitted` on reconnect

Fix for `error` events emitting only once when reconnecting
a single instance of net.Socket.

Fixes joyent/node#7888

Signed-off-by: Fedor Indutny <fedor@indutny.com>

diff --git a/lib/net.js b/lib/net.js
index eda9d84..a267cef 100644 (file)
--- a/lib/net.js
+++ b/lib/net.js
@@ -846,6 +846,7 @@ Socket.prototype.connect = function(options, cb) {
     this._writableState.ended = false;
     this._writableState.ending = false;
     this._writableState.finished = false;
+    this._writableState.errorEmitted = false;
     this.destroyed = false;
     this._handle = null;
   }

diff --git a/test/simple/test-net-reconnect-error.js b/test/simple/test-net-reconnect-error.js
new file mode 100644 (file)
index 0000000..6094e94
--- /dev/null
+++ b/test/simple/test-net-reconnect-error.js
@@ -0,0 +1,52 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var net = require('net');
+var assert = require('assert');
+var N = 50;
+var client_error_count = 0;
+var disconnect_count = 0;
+
+// Hopefully nothing is running on common.PORT
+var c = net.createConnection(common.PORT);
+
+c.on('connect', function() {
+  console.error('CLIENT connected');
+  assert.ok(false);
+});
+
+c.on('error', function(e) {
+  console.error('CLIENT error: ' + e.code);
+  client_error_count++;
+  assert.equal('ECONNREFUSED', e.code);
+});
+
+c.on('close', function() {
+  console.log('CLIENT disconnect');
+  if (disconnect_count++ < N)
+    c.connect(common.PORT); // reconnect
+});
+
+process.on('exit', function() {
+  assert.equal(N + 1, disconnect_count);
+  assert.equal(N + 1, client_error_count);
+});