fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-02 03:02:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: data source logger instance (#4181)

Browse Source
This commit is contained in:
ChengLei Shao 2024-04-26 15:53:57 +08:00 committed by GitHub
parent 2dc9622acc
commit 7849bbd889
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/logger/src/system-logger.ts
View File

@ -1,5 +1,5 @@
import winston, { Logger, format } from 'winston'; import winston, { format, Logger } from 'winston';
import { LoggerOptions, createLogger } from './logger'; import { createLogger, LoggerOptions } from './logger';
import Transport from 'winston-transport'; import Transport from 'winston-transport';
import { SPLAT } from 'triple-beam'; import { SPLAT } from 'triple-beam';
import { getFormat } from './format'; import { getFormat } from './format';
@ -49,7 +49,7 @@ class SystemLoggerTransport extends Transport {
} }
log(info: any, callback: any) { log(info: any, callback: any) {
const { level, message, reqId, app, stack, cause, [SPLAT]: args } = info; const { level, message, reqId, app, dataSourceKey, stack, cause, [SPLAT]: args } = info;
const logger = level === 'error' && this.errorLogger ? this.errorLogger : this.logger; const logger = level === 'error' && this.errorLogger ? this.errorLogger : this.logger;
const { module, submodule, method, ...meta } = args?.[0] || {}; const { module, submodule, method, ...meta } = args?.[0] || {};
logger.log({ logger.log({
@ -62,6 +62,7 @@ class SystemLoggerTransport extends Transport {
method: method || '', method: method || '',
app, app,
reqId, reqId,
dataSourceKey: dataSourceKey || 'main',
}); });
if (cause) { if (cause) {
logger.log({ logger.log({

3
packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-source.ts
View File

@ -90,7 +90,8 @@ export class DataSourceModel extends Model {
const dataSource = app.dataSourceManager.factory.create(type, { const dataSource = app.dataSourceManager.factory.create(type, {
...createOptions, ...createOptions,
name: this.get('key'), name: dataSourceKey,
logger: app.logger.child({ dataSourceKey }),
}); });
if (loadAtAfterStart) { if (loadAtAfterStart) {