dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-05-02 04:23:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

logger refactor

Browse Source
This commit is contained in:
Jan Prochazka
2023-01-28 09:17:57 +01:00
parent dbcc732688
commit a43522752c
3 changed files with 129 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/api/src/index.js
View File

@@ -31,7 +31,7 @@ function configureLogger() {
setLoggerName('main'); setLoggerName('main');
const logger = createPinoLikeLogger({ const logger = createPinoLikeLogger({
pid: process.pid, base: { pid: process.pid },
targets: [ targets: [
{ {
type: 'console', type: 'console',

2
packages/tools/src/getLogger.ts
View File

@@ -3,7 +3,7 @@ import { createPinoLikeLogger, ILogger } from './pinomin';
let _logger: ILogger; let _logger: ILogger;
let _name: string = null; let _name: string = null;
const defaultLogger: ILogger = createPinoLikeLogger({ const defaultLogger: ILogger = createPinoLikeLogger({
pid: global?.process?.pid, base: { pid: global?.process?.pid },
targets: [{ type: 'console', level: 'info' }], targets: [{ type: 'console', level: 'info' }],
}); });

51
packages/tools/src/pinomin.ts
View File

@@ -19,17 +19,17 @@ export interface ILogger {
child(childProps: {}): ILogger; child(childProps: {}): ILogger;
log(record: ILogRecord); log(record: ILogRecord);
} }
export interface ILogRecord { export interface ILogRecord {
time: number;
level: number; level: number;
msg: string; msg: string;
pid: number; pid?: number;
time: number; }
}
class PinoLikeLogger implements ILogger { class PinoLikeLogger implements ILogger {
constructor(public config: ILogConfig, public baseProps: {} = {}) {} constructor(public config: ILogConfig) {}
trace(msg: string); trace(msg: string);
trace(data: {} | Error, msg: string); trace(data: {} | Error, msg: string);
@@ -65,19 +65,17 @@ export interface ILogger {
packRecord(level: number, data, msg?): ILogRecord { packRecord(level: number, data, msg?): ILogRecord {
if (msg) { if (msg) {
return { return {
...this.baseProps, ...this.config.base,
...data, ...data,
level, level,
msg, msg,
pid: this.config.pid,
time: new Date().getTime(), time: new Date().getTime(),
}; };
} }
return { return {
...this.baseProps, ...this.config.base,
level, level,
msg: data, msg: data,
pid: this.config.pid,
time: new Date().getTime(), time: new Date().getTime(),
}; };
} }
@@ -99,43 +97,42 @@ export interface ILogger {
} }
child(childProps: {}): ILogger { child(childProps: {}): ILogger {
return new PinoLikeLogger(this.config, { return new PinoLikeLogger({
...this.baseProps, ...this.config,
...childProps, base: { ...this.config.base, ...childProps },
}); });
} }
} }
export const logLevelNames = { export const logLevelNames = {
10: 'trace', 10: 'trace',
20: 'debug', 20: 'debug',
30: 'info', 30: 'info',
40: 'warn', 40: 'warn',
50: 'error', 50: 'error',
60: 'fatal', 60: 'fatal',
}; };
export const logLevelNumbers = { export const logLevelNumbers = {
trace: 10, trace: 10,
debug: 20, debug: 20,
info: 30, info: 30,
warn: 40, warn: 40,
error: 50, error: 50,
fatal: 60, fatal: 60,
}; };
interface ILogTargetConfig { interface ILogTargetConfig {
level: keyof typeof logLevelNumbers; level: keyof typeof logLevelNumbers;
type: 'console' | 'stream'; type: 'console' | 'stream';
stream?: any; stream?: any;
} }
interface ILogConfig { interface ILogConfig {
pid?: number; base: {};
targets: ILogTargetConfig[]; targets: ILogTargetConfig[];
} }
export function createPinoLikeLogger(config: ILogConfig): ILogger { export function createPinoLikeLogger(config: ILogConfig): ILogger {
return new PinoLikeLogger(config); return new PinoLikeLogger(config);
} }