From 5bc9aa0d08ce3102bfd5831a0083ed40ef0400d9 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Thu, 3 Nov 2022 11:49:39 +0100
Subject: [PATCH] feat(assist): refactored graceful shutdown

---
 ee/utilities/server.js | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/ee/utilities/server.js b/ee/utilities/server.js
index 5ab424ad4..482ddcd17 100644
--- a/ee/utilities/server.js
+++ b/ee/utilities/server.js
@@ -31,6 +31,14 @@ if (process.env.uws !== "true") {
     );
     heapdump && wsapp.use(`${PREFIX}/${P_KEY}/heapdump`, dumps.router);
     wsapp.use(`${PREFIX}/${P_KEY}`, socket.wsRouter);
+    wsapp.get('/private/shutdown', (req, res) => {
+            console.log("Requested shutdown");
+            res.statusCode = 200;
+            res.end("ok!");
+            process.kill(1, "SIGTERM");
+        }
+    );
+
     wsapp.enable('trust proxy');
     const wsserver = wsapp.listen(PORT, HOST, () => {
         console.log(`WS App listening on http://${HOST}:${PORT}`);
@@ -94,6 +102,12 @@ if (process.env.uws !== "true") {
     uapp.post(`${PREFIX}/${P_KEY}/sockets-live/:projectKey`, uWrapper(socket.handlers.socketsLiveByProject));
     uapp.get(`${PREFIX}/${P_KEY}/sockets-live/:projectKey/:sessionId`, uWrapper(socket.handlers.socketsLiveByProject));
 
+    uapp.get('/private/shutdown', (res, req) => {
+            console.log("Requested shutdown");
+            res.writeStatus('200 OK').end("ok!");
+            process.kill(1, "SIGTERM");
+        }
+    );
 
     socket.start(uapp);
 
@@ -112,21 +126,4 @@ if (process.env.uws !== "true") {
         // process.exit(1);
     });
     module.exports = {uapp};
-}
-
-if (process.env.uws !== "true") {
-    wsapp.get('/private/shutdown', (req, res) => {
-            console.log("Requested shutdown");
-            res.statusCode = 200;
-            res.end("ok!");
-            process.kill(1, "SIGTERM");
-        }
-    );
-} else {
-    uapp.get('/private/shutdown', (res, req) => {
-            console.log("Requested shutdown");
-            res.writeStatus('200 OK').end("ok!");
-            process.kill(1, "SIGTERM");
-        }
-    );
 }
\ No newline at end of file