From 2eedf125a81c943bdef8b0b4945bcfe621f4ba70 Mon Sep 17 00:00:00 2001
From: Dorian Niemiec <dorian.niemiec@svrjs.org>
Date: Mon, 20 May 2024 17:27:09 +0200
Subject: [PATCH] Combine crash handlers in master process into one function.

---
 svr.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/svr.js b/svr.js
index 43117e4..9f6267e 100644
--- a/svr.js
+++ b/svr.js
@@ -5806,20 +5806,17 @@ function saveConfig() {
 
 // Process event listeners
 if (cluster.isPrimary || cluster.isPrimary === undefined) {
-  process.on("uncaughtException", function (err) {
-    // CRASH HANDLER
-    serverconsole.locerrmessage("SVR.JS master process just crashed!!!");
-    serverconsole.locerrmessage("Stack:");
-    serverconsole.locerrmessage(generateErrorStack(err));
-    process.exit(err.errno);
-  });
-  process.on("unhandledRejection", function (err) {
-    // CRASH HANDLER
-    serverconsole.locerrmessage("SVR.JS master process just crashed!!!");
+  // Crash handler
+  function crashHandlerMaster(err) {
+    serverconsole.locerrmessage("SVR.JS worker just crashed!!!");
     serverconsole.locerrmessage("Stack:");
     serverconsole.locerrmessage(err.stack ? generateErrorStack(err) : String(err));
     process.exit(err.errno);
-  });
+  }
+
+  process.on("uncaughtException", crashHandlerMaster);
+  process.on("unhandledRejection", crashHandlerMaster);
+
   process.on("exit", function (code) {
     try {
       if (!configJSONRErr && !configJSONPErr) {