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

fix: ensure the restore point is the first thing loaded (#1713)

Browse Source
This commit is contained in:
Alex Christoffer Rasmussen
2025-08-08 17:39:13 +02:00
committed by Carlos Valente
parent f7ccb6bb51
commit 0299463f62
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/app.ts
+8 -5
View File
@@ -32,7 +32,7 @@ import { logger } from './classes/Logger.js';
import { populateStyles } from './setup/loadStyles.js'; import { populateStyles } from './setup/loadStyles.js';
import { eventStore } from './stores/EventStore.js'; import { eventStore } from './stores/EventStore.js';
import { runtimeService } from './services/runtime-service/RuntimeService.js'; import { runtimeService } from './services/runtime-service/RuntimeService.js';
import { restoreService } from './services/RestoreService.js'; import { RestorePoint, restoreService } from './services/RestoreService.js';
import * as messageService from './services/message-service/message.service.js'; import * as messageService from './services/message-service/message.service.js';
import { populateDemo } from './setup/loadDemo.js'; import { populateDemo } from './setup/loadDemo.js';
import { getState } from './stores/runtimeState.js'; import { getState } from './stores/runtimeState.js';
@@ -142,11 +142,16 @@ const checkStart = (currentState: OntimeStartOrder) => {
} }
}; };
let restorePoint: RestorePoint | null = null;
export const initAssets = async (escalateErrorFn?: (error: string, unrecoverable: boolean) => void) => { export const initAssets = async (escalateErrorFn?: (error: string, unrecoverable: boolean) => void) => {
checkStart(OntimeStartOrder.InitAssets); checkStart(OntimeStartOrder.InitAssets);
// initialise logging service, escalateErrorFn only exists in electron // initialise logging service, escalateErrorFn only exists in electron
logger.init(escalateErrorFn); logger.init(escalateErrorFn);
// load restore point if it exists
restorePoint = await restoreService.load();
await clearUploadfolder(); await clearUploadfolder();
populateStyles(); populateStyles();
await populateDemo(); await populateDemo();
@@ -215,10 +220,8 @@ export const startServer = async (): Promise<{ message: string; serverPort: numb
// initialise message service // initialise message service
messageService.init(eventStore.set, eventStore.get); messageService.init(eventStore.set, eventStore.get);
// load restore point if it exists // apply the restore point if it exists
const maybeRestorePoint = await restoreService.load(); runtimeService.init(restorePoint);
runtimeService.init(maybeRestorePoint);
const nif = getNetworkInterfaces(); const nif = getNetworkInterfaces();
consoleSuccess(`Local: http://localhost:${resultPort}${prefix}/editor`); consoleSuccess(`Local: http://localhost:${resultPort}${prefix}/editor`);