cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-09-05 22:39:11 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

send portError to electron

Browse Source
This commit is contained in:
arc-alex
2024-11-29 21:10:52 +01:00
parent c9013fc8cf
commit c9545d06e2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/app.ts
+5 -3
View File
@@ -156,15 +156,16 @@ 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 }> => { ): Promise<{ message: string; serverPort: number; portError: boolean }> => {
checkStart(OntimeStartOrder.InitServer); checkStart(OntimeStartOrder.InitServer);
const settings = getDataProvider().getSettings(); const settings = getDataProvider().getSettings();
const { serverPort } = settings; const { serverPort: desiredPort } = settings;
expressServer = http.createServer(app); expressServer = http.createServer(app);
// 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, serverPort); 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); socket.init(expressServer);
@@ -224,6 +225,7 @@ export const startServer = async (
return { return {
message: returnMessage, message: returnMessage,
serverPort: resultPort, serverPort: resultPort,
portError,
}; };
}; };