gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

graceful handling of sync error

Browse Source
This commit is contained in:
zadam 2023-11-06 00:15:35 +01:00
parent e0d4766c2d
commit 531e9d4aff
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/sync.js
View File

@ -308,7 +308,8 @@ function getEntityChangeRow(entityChange) {
const entityRow = sql.getRow(`SELECT * FROM ${entityName} WHERE ${primaryKey} = ?`, [entityId]); const entityRow = sql.getRow(`SELECT * FROM ${entityName} WHERE ${primaryKey} = ?`, [entityId]);
if (!entityRow) { if (!entityRow) {
throw new Error(`Cannot find entity for entity change ${JSON.stringify(entityChange)}`); log.error(`Cannot find entity for entity change ${JSON.stringify(entityChange)}`);
return null;
} }
if (entityName === 'blobs' && entityRow.content !== null) { if (entityName === 'blobs' && entityRow.content !== null) {
@ -335,6 +336,9 @@ function getEntityChangeRecords(entityChanges) {
} }
const entity = getEntityChangeRow(entityChange); const entity = getEntityChangeRow(entityChange);
if (!entity) {
continue;
}
const record = { entityChange, entity }; const record = { entityChange, entity };