summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-09-18 23:07:41 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2022-09-18 23:07:41 +0900
commitdd35f2cce6789ce8a0cdf15f0db86506efb07a8f (patch)
treec3a955c056969eb2f1ca45adc584308b75f34cbb /packages/backend/src/server/api
parentfix(backend): サービスが二重にインスタンス化されるのを修正 (diff)
downloadsharkey-dd35f2cce6789ce8a0cdf15f0db86506efb07a8f.tar.gz
sharkey-dd35f2cce6789ce8a0cdf15f0db86506efb07a8f.tar.bz2
sharkey-dd35f2cce6789ce8a0cdf15f0db86506efb07a8f.zip
refactor(backend): refactor logger
Diffstat (limited to 'packages/backend/src/server/api')
-rw-r--r--packages/backend/src/server/api/ApiLoggerService.ts6
-rw-r--r--packages/backend/src/server/api/RateLimiterService.ts14
2 files changed, 13 insertions, 7 deletions
diff --git a/packages/backend/src/server/api/ApiLoggerService.ts b/packages/backend/src/server/api/ApiLoggerService.ts
index c8c5fec85c..c4fb25036e 100644
--- a/packages/backend/src/server/api/ApiLoggerService.ts
+++ b/packages/backend/src/server/api/ApiLoggerService.ts
@@ -1,12 +1,14 @@
import { Inject, Injectable } from '@nestjs/common';
-import Logger from '@/logger.js';
+import type Logger from '@/logger.js';
+import { LoggerService } from '@/core/LoggerService.js';
@Injectable()
export class ApiLoggerService {
public logger: Logger;
constructor(
+ private loggerService: LoggerService,
) {
- this.logger = new Logger('api');
+ this.logger = this.loggerService.getLogger('api');
}
}
diff --git a/packages/backend/src/server/api/RateLimiterService.ts b/packages/backend/src/server/api/RateLimiterService.ts
index d390a47b8f..61b7b1ff47 100644
--- a/packages/backend/src/server/api/RateLimiterService.ts
+++ b/packages/backend/src/server/api/RateLimiterService.ts
@@ -2,17 +2,21 @@ import { Inject, Injectable } from '@nestjs/common';
import Limiter from 'ratelimiter';
import Redis from 'ioredis';
import { DI } from '@/di-symbols.js';
-import Logger from '@/logger.js';
+import type Logger from '@/logger.js';
+import { LoggerService } from '@/core/LoggerService.js';
import type { IEndpointMeta } from './endpoints.js';
-const logger = new Logger('limiter');
-
@Injectable()
export class RateLimiterService {
+ #logger: Logger;
+
constructor(
@Inject(DI.redis)
private redisClient: Redis.Redis,
+
+ private loggerService: LoggerService,
) {
+ this.#logger = this.loggerService.getLogger('limiter');
}
public limit(limitation: IEndpointMeta['limit'] & { key: NonNullable<string> }, actor: string) {
@@ -33,7 +37,7 @@ export class RateLimiterService {
return reject('ERR');
}
- logger.debug(`${actor} ${limitation.key} min remaining: ${info.remaining}`);
+ this.#logger.debug(`${actor} ${limitation.key} min remaining: ${info.remaining}`);
if (info.remaining === 0) {
reject('BRIEF_REQUEST_INTERVAL');
@@ -61,7 +65,7 @@ export class RateLimiterService {
return reject('ERR');
}
- logger.debug(`${actor} ${limitation.key} max remaining: ${info.remaining}`);
+ this.#logger.debug(`${actor} ${limitation.key} max remaining: ${info.remaining}`);
if (info.remaining === 0) {
reject('RATE_LIMIT_EXCEEDED');