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

improve request logging

Browse Source
This commit is contained in:
zadam 2020-07-02 23:15:37 +02:00
parent 18749092ff
commit dee4083bf3
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app.js
View File

@ -23,11 +23,6 @@ app.use(helmet({
hidePoweredBy: false // deactivated because electron 4.0 crashes on this right after startup hidePoweredBy: false // deactivated because electron 4.0 crashes on this right after startup
})); }));
app.use((req, res, next) => {
log.request(req);
next();
});
app.use(bodyParser.json({limit: '500mb'})); app.use(bodyParser.json({limit: '500mb'}));
app.use(bodyParser.urlencoded({extended: false})); app.use(bodyParser.urlencoded({extended: false}));
app.use(cookieParser()); app.use(cookieParser());
@ -78,12 +73,10 @@ app.use((req, res, next) => {
// error handler // error handler
app.use((err, req, res, next) => { app.use((err, req, res, next) => {
if (err && err.message && ( if (err && err.message && (
err.message.includes("Invalid package") (err.message.includes("Router not found for request") && err.message.includes(".js.map"))
|| (err.message.includes("Router not found for request") && err.message.includes("node_modules"))
|| (err.message.includes("Router not found for request") && err.message.includes(".js.map"))
|| (err.message.includes("Router not found for request") && err.message.includes(".css.map")) || (err.message.includes("Router not found for request") && err.message.includes(".css.map"))
)) { )) {
// electron 6 outputs a lot of such errors which do not seem important // ignore
} }
else { else {
log.info(err); log.info(err);

6
src/routes/routes.js
View File

@ -111,11 +111,7 @@ function route(method, path, middleware, routeHandler, resultHandler, transactio
res.sendStatus(500); res.sendStatus(500);
} }
const time = Date.now() - start; log.request(req, Date.now() - start);
if (time >= 10) {
console.log(`Slow request: ${time}ms - ${method} ${path}`);
}
}); });
} }

5
src/services/log.js
View File

@ -64,7 +64,7 @@ function error(message) {
const requestBlacklist = [ "/libraries", "/app", "/images", "/stylesheets" ]; const requestBlacklist = [ "/libraries", "/app", "/images", "/stylesheets" ];
function request(req) { function request(req, timeMs) {
for (const bl of requestBlacklist) { for (const bl of requestBlacklist) {
if (req.url.startsWith(bl)) { if (req.url.startsWith(bl)) {
return; return;
@ -75,7 +75,8 @@ function request(req) {
return; return;
} }
info(req.method + " " + req.url); info((timeMs >= 10 ? "Slow " : "") +
req.method + " " + req.url + " took " + timeMs + "ms");
} }
function pad(num) { function pad(num) {