Added error listener to listener object. Closes hapijs#2561.

arb · arb · commit e8d3cb84cfb6 · 2015-05-28T10:00:43.000-04:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -149,6 +149,11 @@ internals.Connection.prototype._start = function (callback) {
         return process.nextTick(callback);
     }
 
+    this.listener.once('error', function (err) {
+
+        return callback(err);
+    });
+
     if (this.type !== 'tcp') {
         this.listener.listen(this.settings.port, callback);
     }
diff --git a/test/connection.js b/test/connection.js
@@ -399,6 +399,20 @@ describe('Connection', function () {
                 });
             });
         });
+
+        it('will return an error if the port is aleady in use', function (done) {
+
+            var server = new Hapi.Server();
+            server.connection({ port: 9000 });
+            server.connection({ port: 9000 });
+
+            server.start(function (err) {
+
+                expect(err).to.exist();
+                expect(err.message).to.equal('listen EADDRINUSE');
+                done();
+            });
+        });
     });
 
     describe('_stop()', function () {

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,11 @@ internals.Connection.prototype._start = function (callback) {`
`149`	`149`	`return process.nextTick(callback);`
`150`	`150`	`}`
`151`	`151`
	`152`	`+ this.listener.once('error', function (err) {`
	`153`	`+`
	`154`	`+ return callback(err);`
	`155`	`+ });`
	`156`	`+`
`152`	`157`	`if (this.type !== 'tcp') {`
`153`	`158`	`this.listener.listen(this.settings.port, callback);`
`154`	`159`	`}`