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

lower lastSyncedPull if server max sync ID is lower

Browse Source
This commit is contained in:
azivner 2019-01-04 18:58:46 +01:00
parent c3913a8735
commit 0be173a8f7
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/api/login.js
View File

@ -10,6 +10,7 @@ const appInfo = require('../../services/app_info');
const eventService = require('../../services/events'); const eventService = require('../../services/events');
const cls = require('../../services/cls'); const cls = require('../../services/cls');
const sqlInit = require('../../services/sql_init'); const sqlInit = require('../../services/sql_init');
const sql = require('../../services/sql');
async function loginSync(req) { async function loginSync(req) {
if (!await sqlInit.schemaExists()) { if (!await sqlInit.schemaExists()) {
@ -44,7 +45,8 @@ async function loginSync(req) {
req.session.loggedIn = true; req.session.loggedIn = true;
return { return {
sourceId: sourceIdService.getCurrentSourceId() sourceId: sourceIdService.getCurrentSourceId(),
maxSyncId: await sql.getValue("SELECT MAX(id) FROM sync")
}; };
} }

11
src/services/sync.js
View File

@ -1,6 +1,5 @@
"use strict"; "use strict";
const url = require('url');
const log = require('./log'); const log = require('./log');
const sql = require('./sql'); const sql = require('./sql');
const sqlInit = require('./sql_init'); const sqlInit = require('./sql_init');
@ -99,6 +98,16 @@ async function doLogin() {
syncContext.sourceId = resp.sourceId; syncContext.sourceId = resp.sourceId;
const lastSyncedPull = await getLastSyncedPull();
// this is important in a scenario where we setup the sync by manually copying the document
// lastSyncedPull then could be pretty off for the newly cloned client
if (lastSyncedPull > resp.maxSyncId) {
log.info(`Lowering last synced pull from ${lastSyncedPull} to ${resp.maxSyncId}`);
await setLastSyncedPull(resp.maxSyncId);
}
return syncContext; return syncContext;
} }