diff --git a/packages/backend/src/GlobalModule.ts b/packages/backend/src/GlobalModule.ts index d5cb177fc4..a2c834a740 100644 --- a/packages/backend/src/GlobalModule.ts +++ b/packages/backend/src/GlobalModule.ts @@ -14,6 +14,7 @@ import { TimeService, NativeTimeService } from '@/core/TimeService.js'; import { EnvService } from '@/core/EnvService.js'; import { CacheManagementService } from '@/core/CacheManagementService.js'; import { InternalEventService } from '@/core/InternalEventService.js'; +import { LoggerService } from '@/core/LoggerService.js'; import { DI } from './di-symbols.js'; import { Config, loadConfig } from './config.js'; import { createPostgresDataSource } from './postgres.js'; @@ -176,12 +177,13 @@ const $TimeService: Provider[] = [ { provide: 'TimeService', useExisting: TimeService }, ]; const $EnvService: Provider[] = [EnvService, { provide: 'EnvService', useExisting: EnvService }]; +const $LoggerService: Provider[] = [LoggerService, { provide: 'LoggerService', useExisting: LoggerService }]; @Global() @Module({ imports: [RepositoryModule], - providers: [$config, $db, $meta, $meilisearch, $redis, $redisForPub, $redisForSub, $redisForTimelines, $redisForReactions, $redisForRateLimit, $CacheManagementService, $InternalEventService, $TimeService, $EnvService].flat(), - exports: [$config, $db, $meta, $meilisearch, $redis, $redisForPub, $redisForSub, $redisForTimelines, $redisForReactions, $redisForRateLimit, $CacheManagementService, $InternalEventService, $TimeService, $EnvService, RepositoryModule].flat(), + providers: [$config, $db, $meta, $meilisearch, $redis, $redisForPub, $redisForSub, $redisForTimelines, $redisForReactions, $redisForRateLimit, $CacheManagementService, $InternalEventService, $TimeService, $EnvService, $LoggerService].flat(), + exports: [$config, $db, $meta, $meilisearch, $redis, $redisForPub, $redisForSub, $redisForTimelines, $redisForReactions, $redisForRateLimit, $CacheManagementService, $InternalEventService, $TimeService, $EnvService, $LoggerService, RepositoryModule].flat(), }) export class GlobalModule implements OnApplicationShutdown { private readonly logger = new Logger('global'); diff --git a/packages/backend/src/core/CoreModule.ts b/packages/backend/src/core/CoreModule.ts index 08ed47cc9f..68d15d6404 100644 --- a/packages/backend/src/core/CoreModule.ts +++ b/packages/backend/src/core/CoreModule.ts @@ -158,12 +158,10 @@ import { ApPersonService } from './activitypub/models/ApPersonService.js'; import { ApQuestionService } from './activitypub/models/ApQuestionService.js'; import { QueueModule } from './QueueModule.js'; import { QueueService } from './QueueService.js'; -import { LoggerService } from './LoggerService.js'; import { SponsorsService } from './SponsorsService.js'; import type { Provider } from '@nestjs/common'; //#region 文字列ベースでのinjection用(循環参照対応のため) -const $LoggerService: Provider = { provide: 'LoggerService', useExisting: LoggerService }; const $AbuseReportService: Provider = { provide: 'AbuseReportService', useExisting: AbuseReportService }; const $AbuseReportNotificationService: Provider = { provide: 'AbuseReportNotificationService', useExisting: AbuseReportNotificationService }; const $AccountMoveService: Provider = { provide: 'AccountMoveService', useExisting: AccountMoveService }; @@ -322,7 +320,6 @@ const $SponsorsService: Provider = { provide: 'SponsorsService', useExisting: Sp QueueModule, ], providers: [ - LoggerService, AbuseReportService, AbuseReportNotificationService, AccountMoveService, @@ -478,7 +475,6 @@ const $SponsorsService: Provider = { provide: 'SponsorsService', useExisting: Sp SponsorsService, //#region 文字列ベースでのinjection用(循環参照対応のため) - $LoggerService, $AbuseReportService, $AbuseReportNotificationService, $AccountMoveService, @@ -634,7 +630,6 @@ const $SponsorsService: Provider = { provide: 'SponsorsService', useExisting: Sp ], exports: [ QueueModule, - LoggerService, AbuseReportService, AbuseReportNotificationService, AccountMoveService, @@ -789,7 +784,6 @@ const $SponsorsService: Provider = { provide: 'SponsorsService', useExisting: Sp SponsorsService, //#region 文字列ベースでのinjection用(循環参照対応のため) - $LoggerService, $AbuseReportService, $AbuseReportNotificationService, $AccountMoveService,