From 9b464ff2db1ffb0eec3fcf1cabfe3d74078a71eb Mon Sep 17 00:00:00 2001
From: arc-alex <ac@omnivox.dk>
Date: Mon, 16 Dec 2024 22:18:22 +0100
Subject: [PATCH] use escalateErrorFn

---
 apps/electron/src/main.js | 2 +-
 apps/server/src/app.ts    | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/electron/src/main.js b/apps/electron/src/main.js
index 8741afdeb..bda89ca52 100644
--- a/apps/electron/src/main.js
+++ b/apps/electron/src/main.js
@@ -23,7 +23,7 @@ if (!isProduction) {
 }
 
 /** Flag holds server loading state */
-let loaded = 'Ontime running';
+let loaded = 'Ontime starting';
 
 /**
  * Flag whether user has requested a quit
diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts
index b084ec13e..8f14459b1 100644
--- a/apps/server/src/app.ts
+++ b/apps/server/src/app.ts
@@ -177,7 +177,7 @@ export const initAssets = async () => {
  */
 export const startServer = async (
   escalateErrorFn?: (error: string) => void,
-): Promise<{ message: string; serverPort: number; portError: boolean }> => {
+): Promise<{ message: string; serverPort: number }> => {
   checkStart(OntimeStartOrder.InitServer);
   const settings = getDataProvider().getSettings();
   const { serverPort: desiredPort } = settings;
@@ -186,7 +186,6 @@ export const startServer = async (
 
   // the express server must be started before the socket otherwise the on error eventlissner will not attach properly
   const resultPort = await serverTryDesiredPort(expressServer, desiredPort);
-  const portError = resultPort !== desiredPort;
   await getDataProvider().setSettings({ ...settings, serverPort: resultPort });
 
   socket.init(expressServer, prefix);
@@ -245,7 +244,6 @@ export const startServer = async (
   return {
     message: returnMessage,
     serverPort: resultPort,
-    portError,
   };
 };
 
@@ -345,7 +343,7 @@ async function serverTryDesiredPort(server: http.Server, desiredPort: number): P
   return new Promise((res) => {
     expressServer.once('error', (e) => {
       if (testForPortInUser(e)) {
-        logger.error(LogOrigin.Server, `Failed open the desired port: ${desiredPort} | to moving to Ephemeral port`);
+        logger.crash(LogOrigin.Server, `Failed open the desired port: ${desiredPort} | to moving to Ephemeral port`);
         server.listen(0, '0.0.0.0', () => {
           // @ts-expect-error TODO: find proper documentation for this api
           const port: number = server.address().port;