gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

server-esm: Make crash async

Browse Source
This commit is contained in:
Elian Doran 2024-07-18 23:26:21 +03:00
parent 8a30663d1e
commit 013f25a49b
No known key found for this signature in database
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/migration.ts
View File

@ -20,7 +20,7 @@ async function migrate() {
if (currentDbVersion < 214) { if (currentDbVersion < 214) {
log.error("Direct migration from your current version is not supported. Please upgrade to the latest v0.60.4 first and only then to this version."); log.error("Direct migration from your current version is not supported. Please upgrade to the latest v0.60.4 first and only then to this version.");
utils.crash(); await utils.crash();
return; return;
} }
@ -84,7 +84,7 @@ async function migrate() {
log.error("migration failed, crashing hard"); // this is not very user-friendly :-/ log.error("migration failed, crashing hard"); // this is not very user-friendly :-/
utils.crash(); utils.crash();
break; // crash() above does not seem to work right away break; // crash() is sometimes async
} }
} }
}); });
@ -135,7 +135,7 @@ async function migrateIfNecessary() {
if (currentDbVersion > appInfo.dbVersion && process.env.TRILIUM_IGNORE_DB_VERSION !== 'true') { if (currentDbVersion > appInfo.dbVersion && process.env.TRILIUM_IGNORE_DB_VERSION !== 'true') {
log.error(`Current DB version ${currentDbVersion} is newer than the current DB version ${appInfo.dbVersion}, which means that it was created by a newer and incompatible version of Trilium. Upgrade to the latest version of Trilium to resolve this issue.`); log.error(`Current DB version ${currentDbVersion} is newer than the current DB version ${appInfo.dbVersion}, which means that it was created by a newer and incompatible version of Trilium. Upgrade to the latest version of Trilium to resolve this issue.`);
utils.crash(); await utils.crash();
} }
if (!isDbUpToDate()) { if (!isDbUpToDate()) {

7
src/services/utils.ts
View File

@ -125,11 +125,10 @@ function escapeRegExp(str: string) {
return str.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1"); return str.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1");
} }
function crash() { async function crash() {
if (isElectron()) { if (isElectron()) {
require('electron').app.exit(1); (await import("electron")).app.exit(1);
} } else {
else {
process.exit(1); process.exit(1);
} }
} }