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

syncification

Browse Source
This commit is contained in:
zadam
2020-06-20 12:31:38 +02:00
parent 30062d687f
commit 88348c560c
97 changed files with 1673 additions and 1700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/services/sync_options.js
View File

@@ -10,19 +10,19 @@ const config = require('./config');
* to live sync server.
*/
async function get(name) {
return (config['Sync'] && config['Sync'][name]) || await optionService.getOption(name);
function get(name) {
return (config['Sync'] && config['Sync'][name]) || optionService.getOption(name);
}
module.exports = {
getSyncServerHost: async () => await get('syncServerHost'),
isSyncSetup: async () => {
const syncServerHost = await get('syncServerHost');
getSyncServerHost: () => get('syncServerHost'),
isSyncSetup: () => {
const syncServerHost = get('syncServerHost');
// special value "disabled" is here to support use case where document is configured with sync server
// and we need to override it with config from config.ini
return !!syncServerHost && syncServerHost !== 'disabled';
},
getSyncTimeout: async () => parseInt(await get('syncServerTimeout')) || 60000,
getSyncProxy: async () => await get('syncProxy')
};
getSyncTimeout: () => parseInt(get('syncServerTimeout')) || 60000,
getSyncProxy: () => get('syncProxy')
};