Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 03:46:37 +01:00
Code Issues Packages Projects Releases Activity

more logging for sync

Browse Source
This commit is contained in:
zadam
2023-09-21 18:13:14 +02:00
parent d0383f3044
commit 79e5e3b65f
3 changed files with 56 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/services/sync.js
View File

@@ -126,8 +126,6 @@ async function doLogin() {
}
async function pullChanges(syncContext) {
let atLeastOnePullApplied = false;
while (true) {
const lastSyncedPull = getLastSyncedPull();
const logMarkerId = utils.randomString(10); // to easily pair sync events between client and server logs
@@ -143,22 +141,7 @@ async function pullChanges(syncContext) {
const pulledDate = Date.now();
sql.transactional(() => {
for (const {entityChange, entity} of entityChanges) {
const changeAppliedAlready = entityChange.changeId
&& !!sql.getValue("SELECT 1 FROM entity_changes WHERE changeId = ?", [entityChange.changeId]);
if (changeAppliedAlready) {
continue;
}
if (!atLeastOnePullApplied) { // send only for first
ws.syncPullInProgress();
atLeastOnePullApplied = true;
}
syncUpdateService.updateEntity(entityChange, entity, syncContext.instanceId);
}
syncUpdateService.updateEntities(entityChanges, syncContext.instanceId);
if (lastSyncedPull !== lastEntityChangeId) {
setLastSyncedPull(lastEntityChangeId);