OpenSource/misskey
OpenSource/misskey
1
0
Fork 0
mirror of https://github.com/misskey-dev/misskey.git synced 2024-12-26 17:00:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

調整

Browse source
This commit is contained in:
おさむのひと 2024-12-10 19:00:15 +09:00
parent 72e6adf5ab
commit ca03491301
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
packages/backend/src/postgres.ts
View file

@ -5,9 +5,8 @@
// https://github.com/typeorm/typeorm/issues/2400 // https://github.com/typeorm/typeorm/issues/2400
import pg from 'pg'; import pg from 'pg';
import { DataSource, Logger } from 'typeorm'; import { DataSource, Logger, type QueryRunner } from 'typeorm';
import * as highlight from 'cli-highlight'; import * as highlight from 'cli-highlight';
import { type QueryRunner } from 'typeorm';
import { entities as charts } from '@/core/chart/entities.js'; import { entities as charts } from '@/core/chart/entities.js';
import { MiAbuseUserReport } from '@/models/AbuseUserReport.js'; import { MiAbuseUserReport } from '@/models/AbuseUserReport.js';
@ -97,32 +96,36 @@ class MyCustomLogger implements Logger {
} }
@bindThis @bindThis
private highlight(sql: string, queryRunner?: QueryRunner) { private highlight(sql: string) {
const result = highlight.highlight(sql, { return highlight.highlight(sql, {
language: 'sql', ignoreIllegals: true, language: 'sql', ignoreIllegals: true,
}); });
}
if (this.printReplicationMode && queryRunner) { @bindThis
const mode = queryRunner.getReplicationMode(); private appendPrefixIfNeeded(message: string, opts?: {
return `[${mode}] ${result}`; queryRunner?: QueryRunner;
}): string {
if (this.printReplicationMode && opts?.queryRunner) {
return `[${opts.queryRunner.getReplicationMode()}] ${message}`;
} else { } else {
return result; return message;
} }
} }
@bindThis @bindThis
public logQuery(query: string, parameters?: any[], queryRunner?: QueryRunner) { public logQuery(query: string, parameters?: any[], queryRunner?: QueryRunner) {
sqlLogger.info(this.highlight(query, queryRunner).substring(0, 100)); sqlLogger.info(this.appendPrefixIfNeeded(this.highlight(query).substring(0, 100), { queryRunner }));
} }
@bindThis @bindThis
public logQueryError(error: string, query: string, parameters?: any[], queryRunner?: QueryRunner) { public logQueryError(error: string, query: string, parameters?: any[], queryRunner?: QueryRunner) {
sqlLogger.error(this.highlight(query, queryRunner)); sqlLogger.error(this.appendPrefixIfNeeded(this.highlight(query), { queryRunner }));
} }
@bindThis @bindThis
public logQuerySlow(time: number, query: string, parameters?: any[], queryRunner?: QueryRunner) { public logQuerySlow(time: number, query: string, parameters?: any[], queryRunner?: QueryRunner) {
sqlLogger.warn(this.highlight(query, queryRunner)); sqlLogger.warn(this.appendPrefixIfNeeded(this.highlight(query), { queryRunner }));
} }
@bindThis @bindThis