Merge pull request molnarg#168 from PhilippSoehnlein/master

nwgh · nwgh · commit 82835aad01ea · 2016-01-28T10:07:19.000-08:00
Allow chaining for Server.listen and Server.on
diff --git a/lib/http.js b/lib/http.js
@@ -536,6 +536,8 @@ Server.prototype.listen = function listen(port, hostname) {
   this._log.info({ on: ((typeof hostname === 'string') ? (hostname + ':' + port) : port) },
                  'Listening for incoming connections');
   this._server.listen.apply(this._server, arguments);
+
+  return this._server;
 };
 
 Server.prototype.close = function close(callback) {
@@ -570,9 +572,9 @@ Object.defineProperty(Server.prototype, 'timeout', {
 // `server` to `this` since that means a listener. Instead, we forward the subscriptions.
 Server.prototype.on = function on(event, listener) {
   if ((event === 'upgrade') || (event === 'timeout')) {
-    this._server.on(event, listener && listener.bind(this));
+    return this._server.on(event, listener && listener.bind(this));
   } else {
-    EventEmitter.prototype.on.call(this, event, listener);
+    return EventEmitter.prototype.on.call(this, event, listener);
   }
 };
 
