zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-20 23:55:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

sync check failure is now shown as error message in frontend

Browse source
This commit is contained in:
azivner 2017-12-12 23:47:17 -05:00
parent 64e8777ed5
commit 643069e8d6
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
public/javascripts/messaging.js
View file

@ -42,6 +42,9 @@ const messaging = (function() {
changesToPushCountEl.html(message.changesToPushCount);
}
else if (message.type === 'sync-hash-check-failed') {
showError("Sync check failed!", 60000);
}
}
function connectWebSocket() {

4
public/javascripts/utils.js
View file

@ -17,7 +17,7 @@ function showMessage(message) {
});
}
function showError(message) {
function showError(message, delay = 10000) {
console.log("error: ", message);
$.notify({
@ -26,7 +26,7 @@ function showError(message) {
},{
// settings
type: 'danger',
delay: 10000
delay: delay
});
}

4
services/sync.js
View file

@ -4,7 +4,6 @@ const log = require('./log');
const rp = require('request-promise');
const sql = require('./sql');
const options = require('./options');
const migration = require('./migration');
const utils = require('./utils');
const config = require('./config');
const source_id = require('./source_id');
@ -14,6 +13,7 @@ const content_hash = require('./content_hash');
const event_log = require('./event_log');
const fs = require('fs');
const app_info = require('./app_info');
const messaging = require('./messaging');
const SYNC_SERVER = config['Sync']['syncServerHost'];
const isSyncSetup = !!SYNC_SERVER;
@ -271,6 +271,8 @@ async function checkContentHash(syncContext) {
log.info("Content hash check PASSED with value: " + localContentHash);
}
else {
await messaging.sendMessage({type: 'sync-hash-check-failed'});
await event_log.addEvent("Content hash check FAILED. Local is " + localContentHash + ", remote is " + resp.content_hash);
}
}