Renamed web server module functions to be in sync with db module functions

Dan McGhan · Dan McGhan · commit 3d4ebbcedc81 · 2018-03-28T16:03:31.000-04:00
diff --git a/javascript/rest-api/part-1-web-server-basics/hr_app/index.js b/javascript/rest-api/part-1-web-server-basics/hr_app/index.js
@@ -4,9 +4,9 @@ async function startup() {
   console.log('Starting application');
 
   try {
-    console.log('Starting web server');
+    console.log('Initializing web server module');
 
-    await webServer.start();
+    await webServer.initialize();
   } catch (err) {
     console.error(err);
 
@@ -22,9 +22,9 @@ async function shutdown(e) {
   console.log('Shutting down');
 
   try {
-    console.log('Closing web server');
+    console.log('Closing web server module');
 
-    await webServer.stop();
+    await webServer.close();
   } catch (e) {
     console.log('Encountered error', e);
 
diff --git a/javascript/rest-api/part-1-web-server-basics/hr_app/package-lock.json b/javascript/rest-api/part-1-web-server-basics/hr_app/package-lock.json
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
@@ -5,7 +5,7 @@ const webServerConfig = require('../config/web-server.js');
 
 let httpServer;
 
-function start() {
+function initialize() {
   return new Promise((resolve, reject) => {
     const app = express();
     httpServer = http.createServer(app);
@@ -30,11 +30,11 @@ function start() {
   });
 }
 
-module.exports.start = start;
+module.exports.initialize = initialize;
 
 // previous code above this line
 
-function stop() {
+function close() {
   return new Promise((resolve, reject) => {
     httpServer.close((err) => {
       if (err) {
@@ -47,4 +47,4 @@ function stop() {
   });
 }
 
-module.exports.stop = stop;
+module.exports.close = close;
diff --git a/javascript/rest-api/part-2-database-basics/hr_app/index.js b/javascript/rest-api/part-2-database-basics/hr_app/index.js
@@ -20,9 +20,9 @@ async function startup() {
   }
 
   try {
-    console.log('Starting web server');
+    console.log('Initializing web server module');
 
-    await webServer.start();
+    await webServer.initialize();
   } catch (err) {
     console.error(err);
 
@@ -38,9 +38,9 @@ async function shutdown(e) {
   console.log('Shutting down application');
 
   try {
-    console.log('Closing web server');
+    console.log('Closing web server module');
 
-    await webServer.stop();
+    await webServer.close();
   } catch (e) {
     console.error(e);
 
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
@@ -6,7 +6,7 @@ const database = require('./database.js');
 
 let httpServer;
 
-function start() {
+function initialize() {
   return new Promise((resolve, reject) => {
     const app = express();
     httpServer = http.createServer(app);
@@ -35,9 +35,9 @@ function start() {
   });
 }
 
-module.exports.start = start;
+module.exports.initialize = initialize;
 
-function stop() {
+function close() {
   return new Promise((resolve, reject) => {
     httpServer.close((err) => {
       if (err) {
@@ -50,4 +50,4 @@ function stop() {
   });
 }
 
-module.exports.stop = stop;
+module.exports.close = close;
