Skip to content

Commit cf40830

Browse files
committed
fix: bump streamroller dependencies
1 parent f4dcef8 commit cf40830

File tree

5 files changed

+20
-39
lines changed

5 files changed

+20
-39
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"lerna": "4.0.0",
4848
"nodemailer": "^6.7.3",
4949
"semver": "^7.3.5",
50-
"streamroller": "^1.0.3",
50+
"streamroller": "^3.0.6",
5151
"tslib": "2.3.1"
5252
},
5353
"devDependencies": {

packages/file/src/FileAppender.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,8 @@ export class FileAppender extends BaseAppender {
9797
public shutdown(): Promise<any> {
9898
process.removeListener("SIGHUP", this.listener);
9999

100-
return new Promise((resolve, reject) => {
101-
this.writer.write("", "utf-8", () => {
102-
this.writer.end(resolve);
103-
});
100+
return new Promise((resolve) => {
101+
this.writer.end("", "utf-8", resolve);
104102
});
105103
}
106104

@@ -145,9 +143,11 @@ export class FileAppender extends BaseAppender {
145143
} else {
146144
stream = new streams.RollingFileStream(file, fileSize, numFiles, options);
147145
}
146+
148147
stream.on("error", (err: any) => {
149148
console.error("FileAppender - Writing to file %s, error happened ", file, err);
150149
});
150+
151151
return stream;
152152
}
153153
}

packages/logger/src/appenders/class/BaseAppender.ts

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {LogEvent} from "../../core/LogEvent";
22
import {Layouts} from "../../layouts/class/Layouts";
33
import {AppenderConfiguration, PartialAppenderConfiguration} from "../interfaces/AppenderConfiguration";
44

5-
export interface IAppenderOptions {
5+
export interface AppenderOptions {
66
name: string;
77
defaultLayout?: string;
88
}
@@ -52,30 +52,27 @@ export interface IBaseAppender {
5252
*
5353
*/
5454
export abstract class BaseAppender implements IBaseAppender {
55-
private _layout: any;
56-
private appenderOptions: IAppenderOptions = {name: ""};
55+
#layout: any;
56+
57+
public appenderOptions: AppenderOptions = {name: ""};
5758

5859
[key: string]: any;
5960

60-
constructor(private _config: AppenderConfiguration) {
61-
this.configure(_config);
61+
constructor(public readonly config: AppenderConfiguration) {
62+
this.configure(config);
6263

6364
if (this["build"]) {
6465
this["build"]();
6566
}
6667
}
6768

68-
get config(): AppenderConfiguration {
69-
return this._config;
70-
}
71-
7269
configure(config: PartialAppenderConfiguration) {
73-
Object.assign(this._config, config);
70+
Object.assign(this.config, config);
7471

75-
this._layout = Layouts.get(this.appenderOptions.defaultLayout || "colored", this._config);
72+
this.#layout = Layouts.get(this.appenderOptions.defaultLayout || "colored", this.config);
7673

77-
if (this._config.layout) {
78-
this._layout = Layouts.get(this._config.layout.type, this._config.layout);
74+
if (this.config.layout) {
75+
this.#layout = Layouts.get(this.config.layout.type, this.config.layout);
7976
}
8077
return this;
8178
}
@@ -85,7 +82,7 @@ export abstract class BaseAppender implements IBaseAppender {
8582
* @param args
8683
*/
8784
layout(...args: any[]): string {
88-
return this._layout.transform(...args);
85+
return this.#layout.transform(...args);
8986
}
9087

9188
abstract write(loggingEvent: LogEvent): any;

packages/logger/src/appenders/decorators/appender.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {AppendersRegistry} from "../registries/AppendersRegistry";
2-
import {IAppenderOptions} from "../class/BaseAppender";
2+
import {AppenderOptions} from "../class/BaseAppender";
33

4-
export function Appender(options: IAppenderOptions) {
4+
export function Appender(options: AppenderOptions) {
55
return (target: any) => {
66
target.prototype.appenderOptions = options;
77
target.$name = options.name;

yarn.lock

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6114,11 +6114,6 @@ date-fns@^2.16.1:
61146114
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.19.0.tgz#65193348635a28d5d916c43ec7ce6fbd145059e1"
61156115
integrity sha512-X3bf2iTPgCAQp9wvjOQytnf5vO5rESYRXlPIVcgSbtT5OTScPcsf9eZU+B/YIkKAtYr5WeCii58BgATrNitlWg==
61166116

6117-
date-format@^2.0.0:
6118-
version "2.1.0"
6119-
resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf"
6120-
integrity sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==
6121-
61226117
date-format@^4.0.6:
61236118
version "4.0.6"
61246119
resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.6.tgz#f6138b8f17968df9815b3d101fc06b0523f066c5"
@@ -6155,7 +6150,7 @@ debug@4.3.3, debug@^4.3.2, debug@^4.3.3:
61556150
dependencies:
61566151
ms "2.1.2"
61576152

6158-
debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
6153+
debug@^3.0.0, debug@^3.1.1, debug@^3.2.5:
61596154
version "3.2.7"
61606155
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
61616156
integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -14656,7 +14651,7 @@ stream-shift@^1.0.0:
1465614651
resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
1465714652
integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
1465814653

14659-
streamroller@3.0.6:
14654+
streamroller@3.0.6, streamroller@^3.0.6:
1466014655
version "3.0.6"
1466114656
resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.0.6.tgz#52823415800ded79a49aa3f7712f50a422b97493"
1466214657
integrity sha512-Qz32plKq/MZywYyhEatxyYc8vs994Gz0Hu2MSYXXLD233UyPeIeRBZARIIGwFer4Mdb8r3Y2UqKkgyDghM6QCg==
@@ -14665,17 +14660,6 @@ streamroller@3.0.6:
1466514660
debug "^4.3.4"
1466614661
fs-extra "^10.0.1"
1466714662

14668-
streamroller@^1.0.3:
14669-
version "1.0.6"
14670-
resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.6.tgz#8167d8496ed9f19f05ee4b158d9611321b8cacd9"
14671-
integrity sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==
14672-
dependencies:
14673-
async "^2.6.2"
14674-
date-format "^2.0.0"
14675-
debug "^3.2.6"
14676-
fs-extra "^7.0.1"
14677-
lodash "^4.17.14"
14678-
1467914663
strict-uri-encode@^1.0.0:
1468014664
version "1.1.0"
1468114665
resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"

0 commit comments

Comments
 (0)