be sure to surface errors from the bootstrap steps

esatterwhite · Dec 24, 2016 · ec53449 · ec53449
1 parent 058085b
commit ec53449
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/server/index.js b/lib/server/index.js
@@ -40,7 +40,8 @@ class Server extends http.Server {
 
   listen(port, host, backlog, callback) {
     this._node.join(null, (err) => {
-      this._node.handle(( req, res) => {
+      if (err) return callback(err)
+      this._node.handle(( req, res ) => {
         this._router.handle( req, res );
       })
       timer.watch('skyring', (err, data) => {

diff --git a/lib/server/node.js b/lib/server/node.js
@@ -57,7 +57,8 @@ class Node extends EventEmitter {
           })
       });
       this._ring.setupChannel();
-      this._tchannel.listen( this._port, host, ()=> {
+      this._tchannel.listen( this._port, host, (er)=> {
+        if(er) return cb(er)
         debug('tchannel listening on ', host, this._port);
         this._ring.bootstrap(seeds, ( er ) => {
           if( er ) return cb(er);