From 10d8639bf8b9f8095e2465e53a8b6f8f7878aa74 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Fri, 29 Oct 2021 15:24:20 +0200
Subject: [PATCH] fix restart during setup process

---
 server/api/controller/setup.js |  9 ++++++---
 server/initialize.server.js    | 15 ++++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/server/api/controller/setup.js b/server/api/controller/setup.js
index 35146d27..e939eca2 100644
--- a/server/api/controller/setup.js
+++ b/server/api/controller/setup.js
@@ -69,12 +69,15 @@ const setupController = {
         })
 
         res.json({ password, email })
-
-        // exit process so pm2 || docker could restart me || service
         log.info(`Admin: ${email} / password: ${password}`)
         log.info('Restart needed')
-        process.exit()
+        
+        res.end()
+        // exit process so pm2 || docker could restart me || service
+        process.kill(process.pid)
+
       } catch (e) {
+        log.error(String(e))
         return res.status(400).send(String(e))
       }
     }
diff --git a/server/initialize.server.js b/server/initialize.server.js
index 6e2ca2db..754781b0 100644
--- a/server/initialize.server.js
+++ b/server/initialize.server.js
@@ -12,15 +12,16 @@ export default function () {
     // close connections/port/unix socket
     async function shutdown () {
       if (TaskManager) { TaskManager.stop() }
-      nuxt.close(async () => {
-        log.info('Closing DB')
-        const sequelize = require('../server/api/models')
-        await sequelize.close()
-        process.exit()
-      })
+      log.info('Closing DB')
+      const sequelize = require('../server/api/models')
+      await sequelize.close()
+      process.off('SIGTERM', shutdown)
+      process.off('SIGINT', shutdown)
+      nuxt.close()
+      process.exit()
     }
     process.on('SIGTERM', shutdown)
-    process.on('SIGINT', shutdown)  
+    process.on('SIGINT', shutdown)
   }
   this.nuxt.hook('listen', start)
 }