From ec44c44ca4131aea1cc3cd1e00f4c88215ced6d7 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Fri, 4 Jul 2025 16:42:58 -0400 Subject: [PATCH 1/3] fix incorrect error logging in ApPersonService --- .../backend/src/core/activitypub/models/ApPersonService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts index 1ca3a007c3..8639be83b2 100644 --- a/packages/backend/src/core/activitypub/models/ApPersonService.ts +++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts @@ -494,7 +494,7 @@ export class ApPersonService implements OnModuleInit, OnApplicationShutdown { user = u as MiRemoteUser; publicKey = await this.userPublickeysRepository.findOneBy({ userId: user.id }); } else { - this.logger.error('Error creating Person:', e instanceof Error ? e : new Error(e as string)); + this.logger.error(`Error creating Person: ${renderInlineError(e)}`); throw e; } } @@ -776,7 +776,7 @@ export class ApPersonService implements OnModuleInit, OnApplicationShutdown { return result; }) .catch(e => { - this.logger.info(`Processing Move Failed @${updated.username}@${updated.host} (${uri})`, { stack: e }); + this.logger.info(`Processing Move Failed @${updated.username}@${updated.host} (${uri}): ${renderInlineError(e)}`); }); } From c190dfa6bc830ce699c6b13226014a00840ccaea Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Fri, 4 Jul 2025 16:43:14 -0400 Subject: [PATCH 2/3] fix incorrect error logging in UrlPreviewService --- packages/backend/src/server/web/UrlPreviewService.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts index 71a142fc6f..438aa5905d 100644 --- a/packages/backend/src/server/web/UrlPreviewService.ts +++ b/packages/backend/src/server/web/UrlPreviewService.ts @@ -33,6 +33,7 @@ import { getIpHash } from '@/misc/get-ip-hash.js'; import { isRetryableError } from '@/misc/is-retryable-error.js'; import * as Acct from '@/misc/acct.js'; import { isNote } from '@/core/activitypub/type.js'; +import { renderInlineError } from '@/misc/render-inline-error.js'; import type { FastifyRequest, FastifyReply } from 'fastify'; export type LocalSummalyResult = SummalyResult & { @@ -260,7 +261,7 @@ export class UrlPreviewService { return reply.code(200).send(summary); } catch (err) { - this.logger.warn(`Failed to get preview of ${url} for ${lang}: ${err}`); + this.logger.warn(`Failed to get preview of ${url} for ${lang}: ${renderInlineError(err)}`); reply.header('Cache-Control', 'max-age=3600'); return reply.code(422).send({ From a1bd0a35808cb84645f7d46715703ad410d0933c Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Thu, 26 Jun 2025 12:19:14 -0400 Subject: [PATCH 3/3] fix two instances of logging full exceptions --- .../backend/src/core/activitypub/models/ApPersonService.ts | 2 +- .../queue/processors/ImportCustomEmojisProcessorService.ts | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts index 8639be83b2..1e163b4084 100644 --- a/packages/backend/src/core/activitypub/models/ApPersonService.ts +++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts @@ -494,7 +494,7 @@ export class ApPersonService implements OnModuleInit, OnApplicationShutdown { user = u as MiRemoteUser; publicKey = await this.userPublickeysRepository.findOneBy({ userId: user.id }); } else { - this.logger.error(`Error creating Person: ${renderInlineError(e)}`); + this.logger.error(`Error creating Person ${uri}: ${renderInlineError(e)}`); throw e; } } diff --git a/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts b/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts index 3be5b8401b..d35f4ac6d9 100644 --- a/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts @@ -68,9 +68,7 @@ export class ImportCustomEmojisProcessorService { fs.writeFileSync(destPath, '', 'binary'); await this.downloadService.downloadUrl(file.url, destPath, { operationTimeout: this.config.import?.downloadTimeout, maxSize: this.config.import?.maxFileSize }); } catch (e) { // TODO: 何度か再試行 - if (e instanceof Error || typeof e === 'string') { - this.logger.error('Error importing custom emojis:', e as Error); - } + this.logger.error(`Error importing custom emojis: ${renderInlineError(e)}`); throw e; }