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

better logging and notifications on script errors for easier debugging

Browse Source
This commit is contained in:
azivner
2018-08-17 11:31:42 +02:00
parent 513748836e
commit 145efe67c3
5 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/services/script.js
View File

@@ -3,6 +3,7 @@ const ScriptContext = require('./script_context');
const repository = require('./repository');
const cls = require('./cls');
const sourceIdService = require('./source_id');
const log = require('./log');
async function executeNote(note, originEntity) {
if (!note.isJavaScript()) {
@@ -25,11 +26,16 @@ async function executeBundle(bundle, startNote, originEntity = null) {
const ctx = new ScriptContext(startNote, bundle.allNotes, originEntity);
if (await bundle.note.hasLabel('manualTransactionHandling')) {
return await execute(ctx, script, '');
try {
if (await bundle.note.hasLabel('manualTransactionHandling')) {
return await execute(ctx, script, '');
}
else {
return await sql.transactional(async () => await execute(ctx, script, ''));
}
}
else {
return await sql.transactional(async () => await execute(ctx, script, ''));
catch (e) {
log.error(`Execution of script "${bundle.note.title}" (${bundle.note.noteId}) failed with error: ${e.message}`);
}
}