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

separate DB connection for each transaction (just for the record, will be reverted probably)

Browse Source
This commit is contained in:
azivner
2017-11-28 17:04:47 -05:00
parent 4d95eb0762
commit fd764f6163
21 changed files with 326 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/sync.js
View File

@@ -149,7 +149,9 @@ async function pullSync(syncContext) {
throw new Error("Unrecognized entity type " + sync.entity_name);
}
await options.setOption('last_synced_pull', sync.id);
await sql.doInTransaction(async db => {
await options.setOption(db, 'last_synced_pull', sync.id);
});
}
log.info("Finished pull");
@@ -182,7 +184,9 @@ async function pushSync(syncContext) {
lastSyncedPush = sync.id;
await options.setOption('last_synced_push', lastSyncedPush);
await sql.doInTransaction(async db => {
await options.setOption(db, 'last_synced_push', lastSyncedPush);
});
}
}
@@ -258,10 +262,10 @@ async function checkContentHash(syncContext) {
const localContentHash = await content_hash.getContentHash();
if (resp.content_hash === localContentHash) {
log.info("Content hash check passed with value: " + localContentHash);
log.info("Content hash check PASSED with value: " + localContentHash);
}
else {
await event_log.addEvent("Content hash check failed. Local is " + localContentHash + ", remote is " + resp.content_hash);
await event_log.addEvent("Content hash check FAILED. Local is " + localContentHash + ", remote is " + resp.content_hash);
}
}