From d339f2a6715f154bae7d68e52393377f0030f18f Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Tue, 22 Dec 2020 00:45:33 -0500
Subject: [PATCH] server: Perform init after adding uncaught exception handler

This avoids an unnecessary `try` block.
---
 src/node/server.js | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/node/server.js b/src/node/server.js
index d14fca92d..ece5ed25b 100755
--- a/src/node/server.js
+++ b/src/node/server.js
@@ -60,22 +60,6 @@ exports.start = async () => {
   stats.gauge('memoryUsage', () => process.memoryUsage().rss);
   stats.gauge('memoryUsageHeap', () => process.memoryUsage().heapUsed);
 
-  await util.promisify(npm.load)();
-
-  try {
-    await db.init();
-    await plugins.update();
-    console.info(`Installed plugins: ${plugins.formatPluginsWithVersion()}`);
-    console.debug(`Installed parts:\n${plugins.formatParts()}`);
-    console.debug(`Installed hooks:\n${plugins.formatHooks()}`);
-    await hooks.aCallAll('loadSettings', {settings});
-    await hooks.aCallAll('createServer');
-  } catch (e) {
-    console.error(`exception thrown: ${e.message}`);
-    if (e.stack) console.log(e.stack);
-    process.exit(1);
-  }
-
   process.on('uncaughtException', exports.exit);
   // As of v14, Node.js does not exit when there is an unhandled Promise rejection. Convert an
   // unhandled rejection into an uncaught exception, which does cause Node.js to exit.
@@ -105,6 +89,15 @@ exports.start = async () => {
   // Pass undefined to exports.exit because this is not an abnormal termination.
   process.on('SIGTERM', () => exports.exit());
 
+  await util.promisify(npm.load)();
+  await db.init();
+  await plugins.update();
+  console.info(`Installed plugins: ${plugins.formatPluginsWithVersion()}`);
+  console.debug(`Installed parts:\n${plugins.formatParts()}`);
+  console.debug(`Installed hooks:\n${plugins.formatHooks()}`);
+  await hooks.aCallAll('loadSettings', {settings});
+  await hooks.aCallAll('createServer');
+
   // Return the HTTP server to make it easier to write tests.
   return express.server;
 };