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

check if sync is configured every minute, not just at app startup, fixes #138

Browse Source
This commit is contained in:
azivner 2018-07-30 16:45:34 +02:00
parent d3d49923b1
commit 01c7e58d47
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/services/sync.js
View File

@ -304,31 +304,20 @@ async function setLastSyncedPush(lastSyncedPush) {
} }
async function updatePushStats() { async function updatePushStats() {
const lastSyncedPush = await optionService.getOption('lastSyncedPush'); if (await syncOptions.isSyncSetup()) {
const lastSyncedPush = await optionService.getOption('lastSyncedPush');
stats.outstandingPushes = await sql.getValue("SELECT COUNT(*) FROM sync WHERE id > ?", [lastSyncedPush]); stats.outstandingPushes = await sql.getValue("SELECT COUNT(*) FROM sync WHERE id > ?", [lastSyncedPush]);
}
} }
sqlInit.dbReady.then(async () => { sqlInit.dbReady.then(async () => {
if (await syncOptions.isSyncSetup()) { setInterval(cls.wrap(sync), 60000);
log.info("Setting up sync to " + await syncOptions.getSyncServerHost() + " with timeout " + await syncOptions.getSyncTimeout());
const syncProxy = await syncOptions.getSyncProxy(); // kickoff initial sync immediately
setTimeout(cls.wrap(sync), 1000);
if (syncProxy) { setInterval(cls.wrap(updatePushStats), 1000);
log.info("Sync proxy: " + syncProxy);
}
setInterval(cls.wrap(sync), 60000);
// kickoff initial sync immediately
setTimeout(cls.wrap(sync), 1000);
setInterval(cls.wrap(updatePushStats), 1000);
}
else {
log.info("Sync server not configured, sync timer not running.")
}
}); });
module.exports = { module.exports = {