From a3609b9b6fd6d80e97feadcd2df27005542319ba Mon Sep 17 00:00:00 2001
From: Reginald Bondoc <reginald@bondoc.net>
Date: Wed, 21 Dec 2022 20:32:38 +0100
Subject: [PATCH] Align with comments

---
 .github/workflows/check-be-pull-request.yml |  1 -
 backend/src/services/database.ts            |  7 +------
 backend/src/services/health.ts              | 12 ++++++------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/check-be-pull-request.yml b/.github/workflows/check-be-pull-request.yml
index ebda38eff..8022a25bc 100644
--- a/.github/workflows/check-be-pull-request.yml
+++ b/.github/workflows/check-be-pull-request.yml
@@ -1,7 +1,6 @@
 name: "Check Backend Pull Request"
 
 on:
-  workflow_dispatch: # remove me
   pull_request:
     types: [opened, synchronize]
     paths:
diff --git a/backend/src/services/database.ts b/backend/src/services/database.ts
index b28195ab2..5fc4955f1 100644
--- a/backend/src/services/database.ts
+++ b/backend/src/services/database.ts
@@ -5,11 +5,6 @@ export const initDatabase = (MONGO_URL: string) => {
   mongoose
     .connect(MONGO_URL)
     .then(() => console.log('Successfully connected to DB'))
-    .catch((e) => {
-      console.log('Failed to connect to DB ', e);
-      setTimeout(() => {
-        console.log(e);
-      }, 5000);
-    });
+    .catch((e) => console.log('Failed to connect to DB ', e));
   return mongoose.connection;
 };
diff --git a/backend/src/services/health.ts b/backend/src/services/health.ts
index 95fef514f..b4ab2a97b 100644
--- a/backend/src/services/health.ts
+++ b/backend/src/services/health.ts
@@ -6,14 +6,14 @@ export const setUpHealthEndpoint = <T>(server: T) => {
   const onSignal = () => {
     console.log('Server is starting clean-up');
     return Promise.all([
-      () => {
+      new Promise((resolve) => {
         if (mongoose.connection && mongoose.connection.readyState == 1) {
-          mongoose.connection.close();
-          () => {
-            console.info('Database connection closed');
-          };
+          mongoose.connection.close()
+            .then(() => resolve('Database connection closed'));
+        } else {
+          resolve('Database connection already closed');
         }
-      }
+      })
     ]);
   };