gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

correctly logging slow async requests

Browse Source
This commit is contained in:
zadam 2021-05-30 21:21:20 +02:00
parent dc5304faa0
commit a76e3f6e2d
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/routes/routes.js
View File

@ -101,7 +101,12 @@ function route(method, path, middleware, routeHandler, resultHandler, transactio
if (resultHandler) { if (resultHandler) {
if (result && result.then) { if (result && result.then) {
result.then(actualResult => resultHandler(req, res, actualResult)) result
.then(actualResult => {
resultHandler(req, res, actualResult);
log.request(req, res, Date.now() - start);
})
.catch(e => { .catch(e => {
log.error(`${method} ${path} threw exception: ` + e.stack); log.error(`${method} ${path} threw exception: ` + e.stack);
@ -110,6 +115,8 @@ function route(method, path, middleware, routeHandler, resultHandler, transactio
} }
else { else {
resultHandler(req, res, result); resultHandler(req, res, result);
log.request(req, res, Date.now() - start);
} }
} }
} }
@ -118,8 +125,6 @@ function route(method, path, middleware, routeHandler, resultHandler, transactio
res.status(500).send(e.message); res.status(500).send(e.message);
} }
log.request(req, res, Date.now() - start);
}); });
} }
@ -239,7 +244,7 @@ function register(app) {
// group of services below are meant to be executed from outside // group of services below are meant to be executed from outside
route(GET, '/api/setup/status', [], setupApiRoute.getStatus, apiResultHandler); route(GET, '/api/setup/status', [], setupApiRoute.getStatus, apiResultHandler);
route(POST, '/api/setup/new-document', [auth.checkAppNotInitialized], setupApiRoute.setupNewDocument, apiResultHandler); route(POST, '/api/setup/new-document', [auth.checkAppNotInitialized], setupApiRoute.setupNewDocument, apiResultHandler, false);
route(POST, '/api/setup/sync-from-server', [auth.checkAppNotInitialized], setupApiRoute.setupSyncFromServer, apiResultHandler, false); route(POST, '/api/setup/sync-from-server', [auth.checkAppNotInitialized], setupApiRoute.setupSyncFromServer, apiResultHandler, false);
route(GET, '/api/setup/sync-seed', [auth.checkCredentials], setupApiRoute.getSyncSeed, apiResultHandler); route(GET, '/api/setup/sync-seed', [auth.checkCredentials], setupApiRoute.getSyncSeed, apiResultHandler);
route(POST, '/api/setup/sync-seed', [auth.checkAppNotInitialized], setupApiRoute.saveSyncSeed, apiResultHandler, false); route(POST, '/api/setup/sync-seed', [auth.checkAppNotInitialized], setupApiRoute.saveSyncSeed, apiResultHandler, false);

8
src/services/sql_init.js
View File

@ -47,7 +47,7 @@ async function initDbConnection() {
} }
async function createInitialDatabase(username, password, theme) { async function createInitialDatabase(username, password, theme) {
log.info("Creating initial database ..."); log.info("Creating database schema ...");
if (isDbInitialized()) { if (isDbInitialized()) {
throw new Error("DB is already initialized"); throw new Error("DB is already initialized");
@ -58,6 +58,8 @@ async function createInitialDatabase(username, password, theme) {
let rootNote; let rootNote;
log.info("Creating root note ...");
sql.transactional(() => { sql.transactional(() => {
sql.executeScript(schema); sql.executeScript(schema);
@ -82,11 +84,15 @@ async function createInitialDatabase(username, password, theme) {
}).save(); }).save();
}); });
log.info("Importing demo content ...");
const dummyTaskContext = new TaskContext("initial-demo-import", 'import', false); const dummyTaskContext = new TaskContext("initial-demo-import", 'import', false);
const zipImportService = require("./import/zip"); const zipImportService = require("./import/zip");
await zipImportService.importZip(dummyTaskContext, demoFile, rootNote); await zipImportService.importZip(dummyTaskContext, demoFile, rootNote);
log.info("Initializing options ...");
sql.transactional(() => { sql.transactional(() => {
const startNoteId = sql.getValue("SELECT noteId FROM branches WHERE parentNoteId = 'root' AND isDeleted = 0 ORDER BY notePosition"); const startNoteId = sql.getValue("SELECT noteId FROM branches WHERE parentNoteId = 'root' AND isDeleted = 0 ORDER BY notePosition");