From 493c794d337d4d04e5c779fc0965e9fc849b430c Mon Sep 17 00:00:00 2001
From: Cameron Clough <cameronjclough@gmail.com>
Date: Wed, 23 Mar 2022 22:43:38 +0000
Subject: [PATCH] fix starting server/worker

---
 src/server/index.js  | 4 +++-
 src/server/server.js | 6 ++++--
 src/worker/index.js  | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/server/index.js b/src/server/index.js
index 6215c98..dd573a5 100644
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -1,5 +1,7 @@
 import log4js from 'log4js';
 
+import server from './server';
+
 log4js.configure({
   appenders: { logfile: { type: 'file', filename: 'server.log' }, out: { type: 'console' } /* {type: "file", filename: "server1.log"} */ },
   categories: { default: { appenders: ['out', 'logfile'], level: 'info' } },
@@ -11,4 +13,4 @@ process.on('unhandledRejection', (error, p) => {
   console.dir(error.stack);
 });
 
-require('./server');
+server();
diff --git a/src/server/server.js b/src/server/server.js
index 24712ca..318dbf1 100644
--- a/src/server/server.js
+++ b/src/server/server.js
@@ -4,11 +4,13 @@ import log4js from 'log4js';
 
 import app from './app';
 
-app.then((server) => {
+export default async () => {
+  const server = await app;
+
   const logger = log4js.getLogger();
   const httpServer = http.createServer(server);
 
   httpServer.listen(process.env.HTTP_PORT, () => {
     logger.info(`RetroPilot Server listening at ${process.env.BASE_URL}`);
   });
-});
+};
diff --git a/src/worker/index.js b/src/worker/index.js
index 1b262ca..0406d13 100644
--- a/src/worker/index.js
+++ b/src/worker/index.js
@@ -1,5 +1,7 @@
 import log4js from 'log4js';
 
+import worker from './worker';
+
 log4js.configure({
   appenders: { logfile: { type: 'file', filename: 'worker.log' }, out: { type: 'console' } },
   categories: { default: { appenders: ['out', 'logfile'], level: 'info' } },
@@ -21,4 +23,4 @@ try {
   process.exit();
 }
 
-require('./worker');
+worker();