Only create index server instance (a lightly modified restify server)…

… if needed

src/express.spec.js

@@ -48,7 +48,6 @@ describe('Acronym API - Express', () => {
     server = `http://localhost:${PORT}`;
     console.log(`Testing against live Node.JS server at ${server}`);
   } else {
-    // include server from index.js
     server = require('./express');
     console.log('Testing against server created in specfile');
   }

src/fastify.spec.js

@@ -30,10 +30,8 @@ const { Pool } = require('pg');
 // npm run --test_live_node_server=true test
 const _live_node_server = process.env?.npm_config_test_live_node_server || 'false';
 const live_node_server = _live_node_server ? _live_node_server === 'true' : false;
-// include server from index.js
 const server = require('./fastify');
 
-
 // usage:
 // const t = generateArray();
 // const v = generateArray(10, (n) => {return {value: n};});

src/index.js

@@ -36,10 +36,6 @@ server.use(restify.plugins.bodyParser());
 server.post('/acronym', routes.Post);
 server.put('/acronym/:acronym', routes.Put);
 
-server.listen(parseInt(config.conf.get('PORT')), function() {
-  console.log('%s listening at %s', server.name, server.url);
-});
-
 // the pool will emit an error on behalf of any idle clients
 // it contains if a backend error or network partition happens
 db.pool.on('error', (err, client) => {
@@ -75,4 +71,15 @@ server.on('uncaughtException', handleError);
 // any other error (fallthru)
 server.on('restifyError', handleError);
 
+
+// run server if used as a module on the command line
+if (require.main === module) {
+  server.listen(parseInt(config.conf.get('PORT')), function() {
+    console.log('%s listening at %s', server.name, server.url);
+  });
+
+  process.on('SIGINT', doClose);
+  process.on('exit', doClose);
+}
+
 module.exports = server;

src/koa.spec.js

@@ -49,7 +49,6 @@ describe('Acronym API - Koa', () => {
       server = `http://localhost:${PORT}`;
       console.log(`Testing against live Node.JS server at ${server}`);
     } else {
-      // include server from index.js
       server = require('./koa');
       console.log('Testing against server created in specfile');
     }

src/plain.spec.js

@@ -48,7 +48,6 @@ describe('Acronym API - Plain HTTP', () => {
     server = `http://localhost:${PORT}`;
     console.log(`Testing against live Node.JS server at ${server}`);
   } else {
-    // include server from index.js
     server = require('./plain');
     console.log('Testing against server created in specfile');
   }

src/restify.js

@@ -105,7 +105,6 @@ if (require.main === module) {
 
   process.on('SIGINT', doClose);
   process.on('exit', doClose);
-
 }
 
 module.exports = server;

src/restify.spec.js

@@ -49,7 +49,6 @@ describe('Acronym API - Restify', () => {
     server = `http://localhost:${PORT}`;
     console.log(`Testing against live Node.JS server at ${server}`);
   } else {
-    // include server from index.js
     server = require('./restify');
     console.log('Testing against server created in specfile');
   }