From 82446e3ef151e671dd4af4b7d71f552b8a2158c0 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 21 Feb 2025 20:06:39 -0600 Subject: [PATCH] Add method and pathname to ditto.http error --- packages/ditto/controllers/error.ts | 5 ++++- packages/ditto/middleware/logiMiddleware.ts | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/ditto/controllers/error.ts b/packages/ditto/controllers/error.ts index 50962fcc..a00a530b 100644 --- a/packages/ditto/controllers/error.ts +++ b/packages/ditto/controllers/error.ts @@ -5,6 +5,9 @@ import { logi } from '@soapbox/logi'; import { errorJson } from '@/utils/log.ts'; export const errorHandler: ErrorHandler = (err, c) => { + const { method } = c.req; + const { pathname } = new URL(c.req.url); + c.header('Cache-Control', 'no-store'); if (err instanceof HTTPException) { @@ -19,7 +22,7 @@ export const errorHandler: ErrorHandler = (err, c) => { return c.json({ error: 'The server was unable to respond in a timely manner' }, 500); } - logi({ level: 'error', ns: 'ditto.http', msg: 'Unhandled error', error: errorJson(err) }); + logi({ level: 'error', ns: 'ditto.http', msg: 'Unhandled error', method, pathname, error: errorJson(err) }); return c.json({ error: 'Something went wrong' }, 500); }; diff --git a/packages/ditto/middleware/logiMiddleware.ts b/packages/ditto/middleware/logiMiddleware.ts index 26233f27..be17e3bb 100644 --- a/packages/ditto/middleware/logiMiddleware.ts +++ b/packages/ditto/middleware/logiMiddleware.ts @@ -12,8 +12,8 @@ export const logiMiddleware: MiddlewareHandler = async (c, next) => { await next(); const end = new Date(); - const delta = (end.getTime() - start.getTime()) / 1000; + const duration = (end.getTime() - start.getTime()) / 1000; const level = c.res.status >= 500 ? 'error' : 'info'; - logi({ level, ns: 'ditto.http.response', method, pathname, status: c.res.status, delta }); + logi({ level, ns: 'ditto.http.response', method, pathname, status: c.res.status, duration }); };