Skip to content

Commit 0c58441

Browse files
authored
fix(log): Revert "deprecate(log): deprecate internal utility methods" (#4436) (#4572)
1 parent 6220121 commit 0c58441

File tree

5 files changed

+9
-38
lines changed

5 files changed

+9
-38
lines changed

log/base_handler.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,14 @@ export class BaseHandler {
5151
if (this.level > logRecord.level) return;
5252

5353
const msg = this.format(logRecord);
54-
this.#log(msg);
54+
this.log(msg);
5555
}
5656

5757
format(logRecord: LogRecord): string {
5858
return this.formatter(logRecord);
5959
}
6060

61-
/**
62-
* @deprecated (will be removed in 0.220.0)
63-
*/
6461
log(_msg: string) {}
65-
#log(msg: string) {
66-
this.log(msg);
67-
}
6862
setup() {}
6963
destroy() {}
7064

log/console_handler.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,12 @@ export class ConsoleHandler extends BaseHandler {
2525
let msg = super.format(logRecord);
2626

2727
if (this.#useColors) {
28-
msg = this.#applyColors(msg, logRecord.level);
28+
msg = this.applyColors(msg, logRecord.level);
2929
}
3030

3131
return msg;
3232
}
33-
#applyColors(msg: string, level: number): string {
34-
return this.applyColors(msg, level);
35-
}
36-
/**
37-
* @deprecated (will be removed in 0.220.0)
38-
*/
33+
3934
applyColors(msg: string, level: number): string {
4035
switch (level) {
4136
case LogLevels.INFO:
@@ -57,7 +52,7 @@ export class ConsoleHandler extends BaseHandler {
5752
return msg;
5853
}
5954

60-
override #log(msg: string) {
55+
override log(msg: string) {
6156
console.log(msg);
6257
}
6358
}

log/file_handler.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,6 @@ export class FileHandler extends BaseHandler {
8585
}
8686
}
8787

88-
#flush() {
89-
this.#flush();
90-
}
91-
92-
/**
93-
* @deprecated (will be removed in 0.220.0)
94-
*/
9588
flush() {
9689
if (this._pointer > 0 && this._file) {
9790
let written = 0;

log/logger.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ export class Logger {
121121
let logMessage: string;
122122
if (msg instanceof Function) {
123123
fnResult = msg();
124-
logMessage = this.#asString(fnResult);
124+
logMessage = this.asString(fnResult);
125125
} else {
126-
logMessage = this.#asString(msg);
126+
logMessage = this.asString(msg);
127127
}
128128
const record: LogRecord = new LogRecord({
129129
msg: logMessage,
@@ -139,12 +139,6 @@ export class Logger {
139139
return msg instanceof Function ? fnResult : msg;
140140
}
141141

142-
#asString(data: unknown, isProperty = false): string {
143-
return this.asString(data, isProperty);
144-
}
145-
/**
146-
* @deprecated (will be removed in 0.220.0)
147-
*/
148142
asString(data: unknown, isProperty = false): string {
149143
if (typeof data === "string") {
150144
if (isProperty) return `"${data}"`;
@@ -163,7 +157,7 @@ export class Logger {
163157
} else if (typeof data === "object") {
164158
return `{${
165159
Object.entries(data)
166-
.map(([k, v]) => `"${k}":${this.#asString(v, true)}`)
160+
.map(([k, v]) => `"${k}":${this.asString(v, true)}`)
167161
.join(",")
168162
}}`;
169163
}

log/rotating_file_handler.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,15 @@ export class RotatingFileHandler extends FileHandler {
9999
const msgByteLength = this._encoder.encode(msg).byteLength + 1;
100100

101101
if (this.#currentFileSize + msgByteLength > this.#maxBytes) {
102-
this.#rotateLogFiles();
102+
this.rotateLogFiles();
103103
this.#currentFileSize = 0;
104104
}
105105

106106
super.log(msg);
107107

108108
this.#currentFileSize += msgByteLength;
109109
}
110-
#rotateLogFiles() {
111-
this.rotateLogFiles();
112-
}
113-
/**
114-
* @deprecated (will be removed in 0.220.0)
115-
*/
110+
116111
rotateLogFiles() {
117112
this.flush();
118113
this._file!.close();

0 commit comments

Comments
 (0)