Merge pull request hapijs#2570 from arb/error

Eran Hammer · Eran Hammer · commit 7edc108c9915 · 2015-05-29T13:08:42.000-07:00
Added "error" event listener
diff --git a/lib/connection.js b/lib/connection.js
@@ -138,6 +138,8 @@ internals.Connection.prototype._init = function () {
 
 internals.Connection.prototype._start = function (callback) {
 
+    var self = this;
+
     if (this._started) {
         return process.nextTick(callback);
     }
@@ -149,12 +151,26 @@ internals.Connection.prototype._start = function (callback) {
         return process.nextTick(callback);
     }
 
+    var onError = function (err) {
+
+        self._started = false;
+        return callback(err);
+    };
+
+    this.listener.once('error', onError);
+
+    var finalize = function () {
+
+        self.listener.removeListener('error', onError);
+        callback();
+    };
+
     if (this.type !== 'tcp') {
-        this.listener.listen(this.settings.port, callback);
+        this.listener.listen(this.settings.port, finalize);
     }
     else {
         var address = this.settings.address || this.settings.host || '0.0.0.0';
-        this.listener.listen(this.settings.port, address, callback);
+        this.listener.listen(this.settings.port, address, finalize);
     }
 };
 
diff --git a/test/connection.js b/test/connection.js
@@ -399,6 +399,24 @@ describe('Connection', function () {
                 });
             });
         });
+
+        it('will return an error if the port is aleady in use', function (done) {
+
+            var server = new Hapi.Server();
+            server.connection();
+
+            server.start(function (err) {
+
+                expect(err).to.not.exist();
+                server.connection({ port: server.info.port });
+                server.start(function (err) {
+
+                    expect(err).to.exist();
+                    expect(err.message).to.match(/EADDRINUSE/);
+                    done();
+                });
+            });
+        });
     });
 
     describe('_stop()', function () {
