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

#98, better error reporting for sync setup

Browse Source
This commit is contained in:
azivner
2018-07-25 22:54:37 +02:00
parent d39cdbfada
commit 02dc7b199b
7 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/routes/api/setup.js
View File

@@ -38,7 +38,12 @@ async function setupSyncToSyncServer() {
rpOpts.proxy = syncProxy;
}
await rp(rpOpts);
try {
await rp(rpOpts);
}
catch (e) {
return { success: false, error: e.message };
}
// this is completely new sync, need to reset counters. If this would not be new sync,
// the previous request would have failed.
@@ -46,6 +51,8 @@ async function setupSyncToSyncServer() {
await optionService.setOption('lastSyncedPull', 0);
syncService.sync();
return { success: true };
}
async function saveSyncSeed(req) {