mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-04 13:39:01 +01:00 
			
		
		
		
	graceful handling of sync error
This commit is contained in:
		
							parent
							
								
									e0d4766c2d
								
							
						
					
					
						commit
						531e9d4aff
					
				@ -308,7 +308,8 @@ function getEntityChangeRow(entityChange) {
 | 
			
		||||
        const entityRow = sql.getRow(`SELECT * FROM ${entityName} WHERE ${primaryKey} = ?`, [entityId]);
 | 
			
		||||
 | 
			
		||||
        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) {
 | 
			
		||||
@ -335,6 +336,9 @@ function getEntityChangeRecords(entityChanges) {
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        const entity = getEntityChangeRow(entityChange);
 | 
			
		||||
        if (!entity) {
 | 
			
		||||
            continue;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        const record = { entityChange, entity };
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user