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

merged "Sync local document" into "Test sync"

Browse Source
This commit is contained in:
azivner
2018-09-10 20:05:10 +02:00
parent b4a566df9e
commit e4381d10e8
7 changed files with 70 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/routes/api/sync.js
View File

@@ -1,6 +1,7 @@
"use strict";
const syncService = require('../../services/sync');
const setupService = require('../../services/setup');
const syncUpdateService = require('../../services/sync_update');
const syncTableService = require('../../services/sync_table');
const sql = require('../../services/sql');
@@ -11,13 +12,20 @@ const log = require('../../services/log');
async function testSync() {
try {
await syncService.login();
if (await setupService.isSyncServerInitialized()) {
await syncService.login();
return { connection: "Success" };
return { success: true, message: "Sync server handshake has been successful" };
}
else {
await setupService.setupSyncToSyncServer();
return { success: true, message: "Sync has been established to the server instance. It will take some time to finish." };
}
}
catch (e) {
return {
connection: "Failure",
success: false,
error: e.message
};
}