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

#98, sync button now shows total number of outstanding syncs instead of just pushes

Browse Source
This commit is contained in:
azivner
2018-07-24 21:43:15 +02:00
parent 37ab7b4641
commit b6935abcc9
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/services/messaging.js
View File

@@ -2,8 +2,6 @@ const WebSocket = require('ws');
const utils = require('./utils');
const log = require('./log');
const sql = require('./sql');
const optionService = require('./options');
const syncSetup = require('./sync_setup');
let webSocketServer;
@@ -65,15 +63,12 @@ async function sendMessageToAllClients(message) {
async function sendPing(client, lastSentSyncId) {
const syncData = await sql.getRows("SELECT * FROM sync WHERE id > ?", [lastSentSyncId]);
const lastSyncedPush = await optionService.getOption('lastSyncedPush');
const changesToPushCount = await sql.getValue("SELECT COUNT(*) FROM sync WHERE id > ?", [lastSyncedPush]);
const stats = require('./sync').stats;
await sendMessage(client, {
type: 'sync',
data: syncData,
changesToPushCount: await syncSetup.isSyncSetup() ? changesToPushCount : 0
outstandingSyncs: stats.outstandingPushes + stats.outstandingPulls
});
}

12
src/services/sync.js
View File

@@ -151,8 +151,6 @@ async function pushSync(syncContext) {
if (filteredSyncs.length === 0) {
log.info("Nothing to push");
stats.outstandingPushes = 0;
await setLastSyncedPush(lastSyncedPush);
break;
@@ -170,8 +168,6 @@ async function pushSync(syncContext) {
lastSyncedPush = syncRecords[syncRecords.length - 1].sync.id;
await setLastSyncedPush(lastSyncedPush);
stats.outstandingPushes = await sql.getValue(`SELECT MAX(id) FROM sync`) - lastSyncedPush;
}
}
@@ -299,6 +295,12 @@ async function setLastSyncedPush(lastSyncedPush) {
await optionService.setOption('lastSyncedPush', lastSyncedPush);
}
async function updatePushStats() {
const lastSyncedPush = await optionService.getOption('lastSyncedPush');
stats.outstandingPushes = await sql.getValue("SELECT COUNT(*) FROM sync WHERE id > ?", [lastSyncedPush]);
}
sqlInit.dbReady.then(async () => {
if (await syncSetup.isSyncSetup()) {
log.info("Setting up sync to " + await syncSetup.getSyncServer() + " with timeout " + await syncSetup.getSyncTimeout());
@@ -313,6 +315,8 @@ sqlInit.dbReady.then(async () => {
// 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.")