From 6f276707e37187a45a875709f349369e3ce7aa16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 11 Nov 2021 20:06:45 +0100
Subject: [PATCH] review comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .../src/service/lib/ServiceBuilderImpl.ts      | 18 +++++++-----------
 packages/backend/src/index.ts                  |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/packages/backend-common/src/service/lib/ServiceBuilderImpl.ts b/packages/backend-common/src/service/lib/ServiceBuilderImpl.ts
index a50fed9e93..885baba54b 100644
--- a/packages/backend-common/src/service/lib/ServiceBuilderImpl.ts
+++ b/packages/backend-common/src/service/lib/ServiceBuilderImpl.ts
@@ -174,6 +174,13 @@ export class ServiceBuilderImpl implements ServiceBuilder {
     const server: http.Server = httpsSettings
       ? await createHttpsServer(app, httpsSettings, logger)
       : createHttpServer(app, logger);
+    const stoppableServer = stoppable(server, 0);
+
+    useHotCleanup(this.module, () =>
+      stoppableServer.stop((e: any) => {
+        if (e) console.error(e);
+      }),
+    );
 
     return new Promise((resolve, reject) => {
       function handleStartupError(e: unknown) {
@@ -181,21 +188,10 @@ export class ServiceBuilderImpl implements ServiceBuilder {
         reject(e);
       }
 
-      app.on('error', handleStartupError);
       server.on('error', handleStartupError);
 
       server.listen(port, host, () => {
-        app.off('error', handleStartupError);
         server.off('error', handleStartupError);
-
-        const stoppableServer = stoppable(server, 0);
-
-        useHotCleanup(this.module, () =>
-          stoppableServer.stop((e: any) => {
-            if (e) console.error(e);
-          }),
-        );
-
         logger.info(`Listening on ${host}:${port}`);
         resolve(stoppableServer);
       });
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index f3e4547e16..ffdce949b7 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -140,7 +140,7 @@ async function main() {
 
   await service.start().catch(err => {
     logger.error(err);
-    throw err;
+    process.exit(1);
   });
 }