gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 11:39:01 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

improve sync error logging

Browse Source
This commit is contained in:
zadam 2023-10-19 00:13:11 +02:00
parent 5b2ba3646d
commit 67a12d3c4d
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/services/request.js
View File

@ -58,10 +58,6 @@ function exec(opts) {
request.on('error', err => reject(generateError(opts, err))); request.on('error', err => reject(generateError(opts, err)));
request.on('response', response => { request.on('response', response => {
if (![200, 201, 204].includes(response.statusCode)) {
reject(generateError(opts, `${response.statusCode} ${response.statusMessage}`));
}
if (opts.cookieJar && response.headers['set-cookie']) { if (opts.cookieJar && response.headers['set-cookie']) {
opts.cookieJar.header = response.headers['set-cookie']; opts.cookieJar.header = response.headers['set-cookie'];
} }
@ -71,16 +67,29 @@ function exec(opts) {
response.on('data', chunk => responseStr += chunk); response.on('data', chunk => responseStr += chunk);
response.on('end', () => { response.on('end', () => {
if ([200, 201, 204].includes(response.statusCode)) {
try { try {
const jsonObj = responseStr.trim() ? JSON.parse(responseStr) : null; const jsonObj = responseStr.trim() ? JSON.parse(responseStr) : null;
resolve(jsonObj); resolve(jsonObj);
} } catch (e) {
catch (e) {
log.error(`Failed to deserialize sync response: ${responseStr}`); log.error(`Failed to deserialize sync response: ${responseStr}`);
reject(generateError(opts, e.message)); reject(generateError(opts, e.message));
} }
} else {
let errorMessage;
try {
const jsonObj = JSON.parse(responseStr);
errorMessage = jsonObj?.message || '';
} catch (e) {
errorMessage = responseStr.substr(0, Math.min(responseStr.length, 100));
}
reject(generateError(opts, `${response.statusCode} ${response.statusMessage} ${errorMessage}`));
}
}); });
}); });