cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-17 13:23:35 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

use escalateErrorFn

Browse Source
This commit is contained in:
arc-alex
2024-12-16 22:18:22 +01:00
parent 544f01630b
commit 9b464ff2db
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/electron/src/main.js
+1 -1
View File
@@ -23,7 +23,7 @@ if (!isProduction) {
} }
/** Flag holds server loading state */ /** Flag holds server loading state */
let loaded = 'Ontime running'; let loaded = 'Ontime starting';
/** /**
* Flag whether user has requested a quit * Flag whether user has requested a quit
apps/server/src/app.ts
+2 -4
View File
@@ -177,7 +177,7 @@ export const initAssets = async () => {
*/ */
export const startServer = async ( export const startServer = async (
escalateErrorFn?: (error: string) => void, escalateErrorFn?: (error: string) => void,
): Promise<{ message: string; serverPort: number; portError: boolean }> => { ): Promise<{ message: string; serverPort: number }> => {
checkStart(OntimeStartOrder.InitServer); checkStart(OntimeStartOrder.InitServer);
const settings = getDataProvider().getSettings(); const settings = getDataProvider().getSettings();
const { serverPort: desiredPort } = settings; 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 // 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 resultPort = await serverTryDesiredPort(expressServer, desiredPort);
const portError = resultPort !== desiredPort;
await getDataProvider().setSettings({ ...settings, serverPort: resultPort }); await getDataProvider().setSettings({ ...settings, serverPort: resultPort });
socket.init(expressServer, prefix); socket.init(expressServer, prefix);
@@ -245,7 +244,6 @@ export const startServer = async (
return { return {
message: returnMessage, message: returnMessage,
serverPort: resultPort, serverPort: resultPort,
portError,
}; };
}; };
@@ -345,7 +343,7 @@ async function serverTryDesiredPort(server: http.Server, desiredPort: number): P
return new Promise((res) => { return new Promise((res) => {
expressServer.once('error', (e) => { expressServer.once('error', (e) => {
if (testForPortInUser(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', () => { server.listen(0, '0.0.0.0', () => {
// @ts-expect-error TODO: find proper documentation for this api // @ts-expect-error TODO: find proper documentation for this api
const port: number = server.address().port; const port: number = server.address().port;