self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-10 00:05:42 +02:00
Code Issues Releases Activity

Server: Improved logging and rendering of low level middleware errors

Browse Source
This commit is contained in:
Laurent Cozic
2021-11-01 19:20:36 +00:00
parent c49174124e
commit 370441333f
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/server/src/app.ts
View File

@ -19,6 +19,7 @@ import apiVersionHandler from './middleware/apiVersionHandler';
import clickJackingHandler from './middleware/clickJackingHandler';
import newModelFactory from './models/factory';
import setupCommands from './utils/setupCommands';
import { RouteResponseFormat, routeResponseFormat } from './utils/routeUtils';
interface Argv {
env?: Env;
@ -139,9 +140,15 @@ async function main() {
} catch (error) {
ctx.status = error.httpCode || 500;
appLogger().error(`Middleware error on ${ctx.path}:`, error);
const responseFormat = routeResponseFormat(ctx);
if (responseFormat === RouteResponseFormat.Html) {
// Since this is a low level error, rendering a view might fail too,
// so catch this and default to rendering JSON.
try {
ctx.response.set('Content-Type', 'text/html');
ctx.body = await ctx.joplin.services.mustache.renderView({
name: 'error',
title: 'Error',
@ -149,7 +156,12 @@ async function main() {
content: { error },
});
} catch (anotherError) {
ctx.body = { error: anotherError.message };
ctx.response.set('Content-Type', 'application/json');
ctx.body = JSON.stringify({ error: error.message });
}
} else {
ctx.response.set('Content-Type', 'application/json');
ctx.body = JSON.stringify({ error: error.message });
}
}
});