From d58c71681c779feee5718d2ce4af2ba42ee1a171 Mon Sep 17 00:00:00 2001
From: ds0 <ds0@ds0>
Date: Tue, 22 Aug 2023 22:35:23 +0100
Subject: [PATCH] For the three services, expressjs, XML_RPC, and Graphql, I
 have moved the port values to a centralised env file

---
 .env                 | 7 +++++--
 app.js               | 8 ++++----
 models/passphrase.js | 4 ++--
 rpc_server.js        | 4 ++--
 startup_script.js    | 4 ++--
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.env b/.env
index e198f95..e02d209 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,10 @@
+EXPRESS_JS_PORT=80
+XML_RPC_PORT=9090
+GRAPHQL_PORT=4000
 JWT_SECRET=access
 MONGO_LOCAL_CONN_URL=mongodb://localhost:27017/node-dvws
 MONGO_DB_NAME=dvws-user-auth
 SQL_LOCAL_CONN_URL=localhost
 SQL_DB_NAME=dvws_sqldb
-SQL_username=root
-SQL_password=mysecretpassword
\ No newline at end of file
+SQL_USERNAME=root
+SQL_PASSWORD=mysecretpassword
diff --git a/app.js b/app.js
index 05e2649..2c93b94 100644
--- a/app.js
+++ b/app.js
@@ -56,8 +56,8 @@ app.use('/api', routes(router));
 
 
   
-app.listen(80, () => {
-    console.log(`🚀 API listening at 80, go to http://dvws.local (127.0.0.1)`);
+app.listen(process.env.EXPRESS_JS_PORT, () => {
+    console.log(`🚀 API listening at http://dvws.local${process.env.EXPRESS_JS_PORT == 80 ? "" : ":" + process.env.EXPRESS_JS_PORT } (127.0.0.1)`);
   });
 
 
@@ -81,8 +81,8 @@ const server = new ApolloServer({
   }, });
 
 
-server.listen().then(({ url }) => {
+server.listen({ port: process.env.GRAPHQL_PORT }).then(({ url }) => {
     console.log(`🚀 GraphQL Server ready at ${url}`);
   });;
 
-module.exports = app;
\ No newline at end of file
+module.exports = app;
diff --git a/models/passphrase.js b/models/passphrase.js
index f28d224..6b0cf77 100644
--- a/models/passphrase.js
+++ b/models/passphrase.js
@@ -2,8 +2,8 @@ const Sequelize = require('sequelize');
 require('dotenv').config();
 
 const connHost = process.env.SQL_LOCAL_CONN_URL;
-const connUser = process.env.SQL_username;
-const connPass = process.env.SQL_password;
+const connUser = process.env.SQL_USERNAME;
+const connPass = process.env.SQL_PASSWORD;
 const connDB = process.env.SQL_DB_NAME;
 
 const sequelize = new Sequelize(connDB, connUser, connPass, {
diff --git a/rpc_server.js b/rpc_server.js
index d47d911..0bf0643 100644
--- a/rpc_server.js
+++ b/rpc_server.js
@@ -2,7 +2,7 @@ var xmlrpc = require('xmlrpc');
 var needle = require('needle');
 
 // Creates an XML-RPC server to listen to XML-RPC method calls
-var server = xmlrpc.createServer({ port: 9090, path: '/xmlrpc' })
+var server = xmlrpc.createServer({ port: process.env.XML_RPC_PORT, path: '/xmlrpc' })
 // Handle methods not found
 server.on('NotFound', function (method, params) {
   console.log('Method ' + method + ' does not exist');
@@ -44,5 +44,5 @@ server.on('dvws.CheckUptime', function (err, params, callback) {
   callback(null, get_result)
 })
 
-console.log('XML-RPC server listening on port 9090')
+console.log(`🚀 XML-RPC server listening on port ${process.env.XML_RPC_PORT}`)
 
diff --git a/startup_script.js b/startup_script.js
index 23938bb..3c3197e 100644
--- a/startup_script.js
+++ b/startup_script.js
@@ -7,8 +7,8 @@ const User = require('./models/users');
 
 
 const connHost = process.env.SQL_LOCAL_CONN_URL;
-const connUser = process.env.SQL_username;
-const connPass = process.env.SQL_password;
+const connUser = process.env.SQL_USERNAME;
+const connPass = process.env.SQL_PASSWORD;
 const connUri = process.env.MONGO_LOCAL_CONN_URL;
 
 const sequelize = new Sequelize('dvws_sqldb', connUser, connPass, {