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

opening transactions only on write operations which enforces exclusive lock only there to improve concurrency, custom handling of sync request timeouts, #1093, #1018

Browse Source
This commit is contained in:
zadam
2020-06-13 10:23:36 +02:00
parent d09b021487
commit 5d47c2b23e
10 changed files with 95 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/public/app/services/utils.js
View File

@@ -316,11 +316,11 @@ function dynamicRequire(moduleName) {
}
}
function timeLimit(cb, limitMs) {
function timeLimit(promise, limitMs) {
return new Promise((res, rej) => {
let resolved = false;
cb().then(() => {
promise.then(() => {
resolved = true;
res();
@@ -328,7 +328,7 @@ function timeLimit(cb, limitMs) {
setTimeout(() => {
if (!resolved) {
rej('Process exceeded time limit ' + limitMs);
rej(new Error('Process exceeded time limit ' + limitMs));
}
}, limitMs);
});