mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-07-09 05:24:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

correctly parse response errors for logging

Browse source
This commit is contained in:
Hazelnoot 2025-05-06 17:42:23 -04:00
parent 2aa3cf2731
commit c0f24eaf5d
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/logger.ts
View file

@ -27,7 +27,7 @@ export type DataObject = Record<string, unknown> | (object & { length?: never; }
export default class Logger { export default class Logger {
private context: Context; private context: Context;
private parentLogger: Logger | null = null; private parentLogger: Logger | null = null;
private readonly verbose: boolean; public readonly verbose: boolean;
constructor(context: string, color?: KEYWORD, verbose?: boolean) { constructor(context: string, color?: KEYWORD, verbose?: boolean) {
this.context = { this.context = {

9
packages/backend/src/server/api/mastodon/MastodonApiServerService.ts
View file

@ -56,9 +56,12 @@ export class MastodonApiServerService {
// Log error responses (including converted JSON exceptions) // Log error responses (including converted JSON exceptions)
fastify.addHook('onSend', (request, reply, payload, done) => { fastify.addHook('onSend', (request, reply, payload, done) => {
if (reply.statusCode >= 400) { if (reply.statusCode >= 500 || (reply.statusCode >= 400 && this.logger.verbose)) {
const data = getErrorData(payload); if (typeof(payload) === 'string' && String(reply.getHeader('content-type')).toLowerCase().includes('application/json')) {
this.logger.error(request, data, reply.statusCode); const body = JSON.parse(payload);
const data = getErrorData(body);
this.logger.error(request, data, reply.statusCode);
}
} }
done(); done();
}); });

10
packages/backend/src/server/api/mastodon/MastodonLogger.ts
View file

@ -3,22 +3,22 @@
* SPDX-License-Identifier: AGPL-3.0-only * SPDX-License-Identifier: AGPL-3.0-only
*/ */
import { Inject, Injectable } from '@nestjs/common'; import { Injectable } from '@nestjs/common';
import { FastifyRequest } from 'fastify'; import { FastifyRequest } from 'fastify';
import Logger from '@/logger.js'; import Logger from '@/logger.js';
import { LoggerService } from '@/core/LoggerService.js'; import { LoggerService } from '@/core/LoggerService.js';
import { ApiError } from '@/server/api/error.js'; import { ApiError } from '@/server/api/error.js';
import { EnvService } from '@/core/EnvService.js';
import { getBaseUrl } from '@/server/api/mastodon/MastodonClientService.js'; import { getBaseUrl } from '@/server/api/mastodon/MastodonClientService.js';
@Injectable() @Injectable()
export class MastodonLogger { export class MastodonLogger {
public readonly logger: Logger; public readonly logger: Logger;
constructor( public get verbose() {
@Inject(EnvService) return this.logger.verbose;
private readonly envService: EnvService, }
constructor(
loggerService: LoggerService, loggerService: LoggerService,
) { ) {
this.logger = loggerService.getLogger('masto-api'); this.logger = loggerService.getLogger('masto-api');