Skip to content

Commit b4497ec

Browse files
committed
[#369] Extract logger.setRootLogger out of AgentBuilder
1 parent 14e16d6 commit b4497ec

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@
99
const { AgentBuilder } = require('./lib/agent-builder')
1010
const AgentInfo = require('./lib/data/dto/agent-info')
1111
const { getConfig } = require('./lib/config')
12+
const { LogBuilder } = require('./lib/utils/log/log-builder')
13+
const logger = require('./lib/utils/log/logger')
1214

1315
const config = getConfig()
16+
logger.setRootLogger(LogBuilder.createDefaultLogBuilder().setConfig(config).build())
17+
1418
const agentInfo = AgentInfo.make(config)
1519
const agent = new AgentBuilder(agentInfo)
1620
.setConfig(config)

lib/agent-builder.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
'use strict'
88

9-
const { LogBuilder } = require('./utils/log/log-builder')
109
const logger = require('./utils/log/logger')
1110
const dataSenderFactory = require('./client/data-sender-factory')
1211
const stringMetaService = require('./context/string-meta-service')
@@ -120,7 +119,6 @@ class AgentBuilder {
120119
if (!this.config) {
121120
this.config = getConfig()
122121
}
123-
logger.setRootLogger(LogBuilder.createDefaultLogBuilder().setConfig(this.config).build())
124122

125123
const agent = new Agent(this.agentInfo, this.config, logger)
126124
if (!this.dataSender) {

lib/utils/log/types.d.ts

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,17 @@ export declare interface Appender {
2525
}
2626

2727
export declare class LogBuilder {
28-
constructor(name?: string);
28+
static createDefaultLogBuilder(): LogBuilder;
2929

30+
constructor(name?: string);
31+
build(): Log;
3032
logLevelDebug(): LogBuilder;
3133
logLevelInfo(): LogBuilder;
3234
logLevelWarn(): LogBuilder;
3335
logLevelError(): LogBuilder;
3436
logLevelSilent(): LogBuilder;
35-
3637
addAppender(appender: Appender): LogBuilder;
37-
38-
build(): Log;
39-
40-
static LogLevel: typeof LogLevel;
38+
setConfig(config: { [key: string]: any }): LogBuilder;
4139
}
4240

4341
export declare class Log {
@@ -53,22 +51,20 @@ export declare interface Logging {
5351
info(...args: any[]): void;
5452
warn(...args: any[]): void;
5553
error(...args: any[]): void;
56-
5754
isDebug(): boolean;
5855
isInfo(): boolean;
5956
}
6057

6158
export declare class Logger implements Logging {
62-
6359
debug(...args: any[]): void;
6460
info(...args: any[]): void;
6561
warn(...args: any[]): void;
6662
error(...args: any[]): void;
67-
6863
isDebug(): boolean;
6964
isInfo(): boolean;
7065

7166
getLogger(log: Log): Logger;
67+
setRootLogger(log: Log): void;
7268
}
7369

7470
export declare class ChildLogger implements Logging {
@@ -78,7 +74,6 @@ export declare class ChildLogger implements Logging {
7874
info(...args: any[]): void;
7975
warn(...args: any[]): void;
8076
error(...args: any[]): void;
81-
8277
isDebug(): boolean;
8378
isInfo(): boolean;
8479
}

0 commit comments

Comments
 (0)