Fixed error in httpServer.listen error handling

Dan McGhan · Dan McGhan · commit 84bc3ee10ca8 · 2018-09-20T10:29:25.000-04:00
diff --git a/javascript/rest-api/part-1-web-server-basics/hr_app/services/web-server.js b/javascript/rest-api/part-1-web-server-basics/hr_app/services/web-server.js
@@ -17,16 +17,15 @@ function initialize() {
       res.end('Hello World!');
     });
 
-    httpServer.listen(webServerConfig.port, err => {
-      if (err) {
-        reject(err);
-        return;
-      }
+    httpServer.listen(webServerConfig.port)
+      .on('listening', () => {
+        console.log(`Web server listening on localhost:${webServerConfig.port}`);
 
-      console.log(`Web server listening on localhost:${webServerConfig.port}`);
-
-      resolve();
-    });
+        resolve();
+      })
+      .on('error', err => {
+        reject(err);
+      });
   });
 }
 
diff --git a/javascript/rest-api/part-2-database-basics/hr_app/services/web-server.js b/javascript/rest-api/part-2-database-basics/hr_app/services/web-server.js
@@ -22,16 +22,15 @@ function initialize() {
       res.end(`DB user: ${user}\nDate: ${date}`);
     });
 
-    httpServer.listen(webServerConfig.port, err => {
-      if (err) {
-        reject(err);
-        return;
-      }
+    httpServer.listen(webServerConfig.port)
+      .on('listening', () => {
+        console.log(`Web server listening on localhost:${webServerConfig.port}`);
 
-      console.log(`Web server listening on localhost:${webServerConfig.port}`);
-
-      resolve();
-    });
+        resolve();
+      })
+      .on('error', err => {
+        reject(err);
+      });
   });
 }
 
diff --git a/javascript/rest-api/part-3-handling-get-requests/hr_app/services/web-server.js b/javascript/rest-api/part-3-handling-get-requests/hr_app/services/web-server.js
@@ -17,16 +17,15 @@ function initialize() {
     // Mount the router at /api so all its routes start with /api
     app.use('/api', router);
 
-    httpServer.listen(webServerConfig.port, err => {
-      if (err) {
-        reject(err);
-        return;
-      }
+    httpServer.listen(webServerConfig.port)
+      .on('listening', () => {
+        console.log(`Web server listening on localhost:${webServerConfig.port}`);
 
-      console.log(`Web server listening on localhost:${webServerConfig.port}`);
-
-      resolve();
-    });
+        resolve();
+      })
+      .on('error', err => {
+        reject(err);
+      });
   });
 }
 
diff --git a/javascript/rest-api/part-4-handling-post-put-and-delete-requests/hr_app/services/web-server.js b/javascript/rest-api/part-4-handling-post-put-and-delete-requests/hr_app/services/web-server.js
@@ -22,16 +22,15 @@ function initialize() {
     // Mount the router at /api so all its routes start with /api
     app.use('/api', router);
 
-    httpServer.listen(webServerConfig.port, err => {
-      if (err) {
-        reject(err);
-        return;
-      }
+    httpServer.listen(webServerConfig.port)
+      .on('listening', () => {
+        console.log(`Web server listening on localhost:${webServerConfig.port}`);
 
-      console.log(`Web server listening on localhost:${webServerConfig.port}`);
-
-      resolve();
-    });
+        resolve();
+      })
+      .on('error', err => {
+        reject(err);
+      });
   });
 }
 
diff --git a/javascript/rest-api/part-5-manual-pagination-sorting-and-filtering/hr_app/services/web-server.js b/javascript/rest-api/part-5-manual-pagination-sorting-and-filtering/hr_app/services/web-server.js
@@ -22,16 +22,15 @@ function initialize() {
     // Mount the router at /api so all its routes start with /api
     app.use('/api', router);
 
-    httpServer.listen(webServerConfig.port, err => {
-      if (err) {
-        reject(err);
-        return;
-      }
+    httpServer.listen(webServerConfig.port)
+      .on('listening', () => {
+        console.log(`Web server listening on localhost:${webServerConfig.port}`);
 
-      console.log(`Web server listening on localhost:${webServerConfig.port}`);
-
-      resolve();
-    });
+        resolve();
+      })
+      .on('error', err => {
+        reject(err);
+      });
   });
 }
 
diff --git a/javascript/rest-api/subsequent-modules/module-based-pagination-sorting-and-filtering/hr_app/services/web-server.js b/javascript/rest-api/subsequent-modules/module-based-pagination-sorting-and-filtering/hr_app/services/web-server.js
@@ -22,16 +22,15 @@ function initialize() {
     // Mount the router at /api so all its routes start with /api
     app.use('/api', router);
 
-    httpServer.listen(webServerConfig.port, err => {
-      if (err) {
-        reject(err);
-        return;
-      }
+    httpServer.listen(webServerConfig.port)
+      .on('listening', () => {
+        console.log(`Web server listening on localhost:${webServerConfig.port}`);
 
-      console.log(`Web server listening on localhost:${webServerConfig.port}`);
-
-      resolve();
-    });
+        resolve();
+      })
+      .on('error', err => {
+        reject(err);
+      });
   });
 }
 
