summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2024-11-14 20:25:48 -0500
committerHazelnoot <acomputerdog@gmail.com>2024-11-20 22:03:32 -0500
commit0f6d26e065731f70b75afda3542381409cbc9569 (patch)
treec5aee78b114becb007833d4b61fb60e39ad18a91
parentmerge: Bump develop version (!766) (diff)
downloadsharkey-0f6d26e065731f70b75afda3542381409cbc9569.tar.gz
sharkey-0f6d26e065731f70b75afda3542381409cbc9569.tar.bz2
sharkey-0f6d26e065731f70b75afda3542381409cbc9569.zip
reduce log spam from charts
-rw-r--r--packages/backend/src/core/chart/ChartManagementService.ts7
-rw-r--r--packages/backend/src/core/chart/core.ts8
2 files changed, 11 insertions, 4 deletions
diff --git a/packages/backend/src/core/chart/ChartManagementService.ts b/packages/backend/src/core/chart/ChartManagementService.ts
index 79681370a1..316feec6ee 100644
--- a/packages/backend/src/core/chart/ChartManagementService.ts
+++ b/packages/backend/src/core/chart/ChartManagementService.ts
@@ -6,6 +6,8 @@
import { Injectable } from '@nestjs/common';
import { bindThis } from '@/decorators.js';
+import { ChartLoggerService } from '@/core/chart/ChartLoggerService.js';
+import Logger from '@/logger.js';
import FederationChart from './charts/federation.js';
import NotesChart from './charts/notes.js';
import UsersChart from './charts/users.js';
@@ -24,6 +26,7 @@ import type { OnApplicationShutdown } from '@nestjs/common';
export class ChartManagementService implements OnApplicationShutdown {
private charts;
private saveIntervalId: NodeJS.Timeout;
+ private readonly logger: Logger;
constructor(
private federationChart: FederationChart,
@@ -38,6 +41,7 @@ export class ChartManagementService implements OnApplicationShutdown {
private perUserFollowingChart: PerUserFollowingChart,
private perUserDriveChart: PerUserDriveChart,
private apRequestChart: ApRequestChart,
+ private chartLoggerService: ChartLoggerService,
) {
this.charts = [
this.federationChart,
@@ -53,6 +57,7 @@ export class ChartManagementService implements OnApplicationShutdown {
this.perUserDriveChart,
this.apRequestChart,
];
+ this.logger = chartLoggerService.logger;
}
@bindThis
@@ -62,6 +67,7 @@ export class ChartManagementService implements OnApplicationShutdown {
for (const chart of this.charts) {
chart.save();
}
+ this.logger.info('All charts saved');
}, 1000 * 60 * 20);
}
@@ -72,6 +78,7 @@ export class ChartManagementService implements OnApplicationShutdown {
await Promise.all(
this.charts.map(chart => chart.save()),
);
+ this.logger.info('All charts saved');
}
}
diff --git a/packages/backend/src/core/chart/core.ts b/packages/backend/src/core/chart/core.ts
index af5485a46e..234c1d63b4 100644
--- a/packages/backend/src/core/chart/core.ts
+++ b/packages/backend/src/core/chart/core.ts
@@ -368,7 +368,7 @@ export default abstract class Chart<T extends Schema> {
// 初期ログデータを作成
data = this.getNewLog(null);
- this.logger.info(`${this.name + (group ? `:${group}` : '')}(${span}): Initial commit created`);
+ this.logger.debug(`${this.name + (group ? `:${group}` : '')}(${span}): Initial commit created`);
}
const date = Chart.dateToTimestamp(current);
@@ -398,7 +398,7 @@ export default abstract class Chart<T extends Schema> {
...columns,
}) as RawRecord<T>;
- this.logger.info(`${this.name + (group ? `:${group}` : '')}(${span}): New commit created`);
+ this.logger.debug(`${this.name + (group ? `:${group}` : '')}(${span}): New commit created`);
return log;
} finally {
@@ -418,7 +418,7 @@ export default abstract class Chart<T extends Schema> {
@bindThis
public async save(): Promise<void> {
if (this.buffer.length === 0) {
- this.logger.info(`${this.name}: Write skipped`);
+ this.logger.debug(`${this.name}: Write skipped`);
return;
}
@@ -519,7 +519,7 @@ export default abstract class Chart<T extends Schema> {
.execute(),
]);
- this.logger.info(`${this.name + (logHour.group ? `:${logHour.group}` : '')}: Updated`);
+ this.logger.debug(`${this.name + (logHour.group ? `:${logHour.group}` : '')}: Updated`);
// TODO: この一連の処理が始まった後に新たにbufferに入ったものは消さないようにする
this.buffer = this.buffer.filter(q => q.group != null && (q.group !== logHour.group));