@@ -7,16 +7,14 @@ import fx from 'mkdir-recursive';
77import { rimrafSync } from 'rimraf' ;
88import assert from 'assert' ;
99
10- const LOG_LEVELS = [ 'error' , 'warning' , 'info' , 'debug' ] as const ;
11- type LogLevel = typeof LOG_LEVELS [ number ] ;
12-
1310class Logger {
14- private level : LogLevel ;
11+ private level : settings . LogLevel ;
1512 private output : string [ ] ;
1613 private directory : string ;
1714 private logger : winston . Logger ;
1815 private fileTransport : winston . transports . FileTransportInstance ;
1916 private debugNamespaceIgnoreRegex ?: RegExp ;
17+ private namespacedLevels : Record < string , settings . LogLevel > ;
2018
2119 public init ( ) : void {
2220 // What transports to enable
@@ -25,20 +23,18 @@ class Logger {
2523 const timestamp = moment ( Date . now ( ) ) . format ( 'YYYY-MM-DD.HH-mm-ss' ) ;
2624 this . directory = settings . get ( ) . advanced . log_directory . replace ( '%TIMESTAMP%' , timestamp ) ;
2725 const logFilename = settings . get ( ) . advanced . log_file . replace ( '%TIMESTAMP%' , timestamp ) ;
28- // Determine the log level.
29- const settingLevel = settings . get ( ) . advanced . log_level ;
30- // workaround for syslog<>npm level conflict
31- this . level = settingLevel === 'warn' ? 'warning' : settingLevel ;
26+ this . level = settings . get ( ) . advanced . log_level ;
27+ this . namespacedLevels = settings . get ( ) . advanced . log_namespaced_levels ;
3228
3329 assert (
34- LOG_LEVELS . includes ( this . level ) ,
35- `'${ this . level } ${ LOG_LEVELS . join ( ', ' ) } ,
30+ settings . LOG_LEVELS . includes ( this . level ) ,
31+ `'${ this . level } ${ settings . LOG_LEVELS . join ( ', ' ) } ,
3632 ) ;
3733
3834 const timestampFormat = ( ) : string => moment ( ) . format ( settings . get ( ) . advanced . timestamp_format ) ;
3935
4036 this . logger = winston . createLogger ( {
41- level : this . level ,
37+ level : 'debug' ,
4238 format : winston . format . combine (
4339 winston . format . errors ( { stack : true } ) ,
4440 winston . format . timestamp ( { format : timestampFormat } ) ,
@@ -81,9 +77,8 @@ class Logger {
8177 // Add file logger when enabled
8278 // eslint-disable-next-line max-len
8379 // NOTE: the initiation of the logger even when not added as transport tries to create the logging directory
84- const transportFileOptions : KeyValue = {
80+ const transportFileOptions : winston . transports . FileTransportOptions = {
8581 filename : path . join ( this . directory , logFilename ) ,
86- json : false ,
8782 format : winston . format . printf ( /* istanbul ignore next */ ( info ) => {
8883 return `[${ info . timestamp } ${ info . level } ${ info . namespace } ${ info . message } ;
8984 } ) ,
@@ -131,7 +126,6 @@ class Logger {
131126 }
132127
133128 public addTransport ( transport : winston . transport ) : void {
134- transport . level = this . level ;
135129 this . logger . add ( transport ) ;
136130 }
137131
@@ -147,41 +141,48 @@ class Logger {
147141 this . debugNamespaceIgnoreRegex = value != '' ? new RegExp ( value ) : undefined ;
148142 }
149143
150- // TODO refactor Z2M level to 'warning' to simplify logic
151- public getLevel ( ) : LogLevel | 'warn' {
152- return this . level === 'warning' ? 'warn' : this . level ;
144+ public getLevel ( ) : settings . LogLevel {
145+ return this . level ;
153146 }
154147
155- public setLevel ( level : LogLevel | 'warn' ) : void {
156- if ( level === 'warn' ) {
157- level = 'warning' ;
148+ public setLevel ( level : settings . LogLevel ) : void {
149+ this . level = level ;
150+ }
151+
152+ public getNamespacedLevels ( ) : Record < string , settings . LogLevel > {
153+ return this . namespacedLevels ;
154+ }
155+
156+ public setNamespacedLevels ( nsLevels : Record < string , settings . LogLevel > ) : void {
157+ this . namespacedLevels = nsLevels ;
158+ }
159+
160+ private log ( level : settings . LogLevel , message : string , namespace : string ) : void {
161+ const nsLevel = this . namespacedLevels [ namespace ] ?? this . level ;
162+
163+ if ( settings . LOG_LEVELS . indexOf ( level ) <= settings . LOG_LEVELS . indexOf ( nsLevel ) ) {
164+ this . logger . log ( level , message , { namespace} ) ;
158165 }
166+ }
159167
160- this . level = level ;
161- this . logger . transports . forEach ( ( transport ) => transport . level = this . level ) ;
168+ public error ( message : string , namespace : string = 'z2m' ) : void {
169+ this . log ( 'error' , message , namespace ) ;
162170 }
163171
164172 public warning ( message : string , namespace : string = 'z2m' ) : void {
165- this . logger . warning ( message , { namespace} ) ;
173+ this . log ( 'warning' , message , namespace ) ;
166174 }
167175
168176 public info ( message : string , namespace : string = 'z2m' ) : void {
169- this . logger . info ( message , { namespace} ) ;
177+ this . log ( 'info' , message , namespace ) ;
170178 }
171179
172180 public debug ( message : string , namespace : string = 'z2m' ) : void {
173- if ( this . level !== 'debug' ) {
174- return ;
175- }
176181 if ( this . debugNamespaceIgnoreRegex ?. test ( namespace ) ) {
177182 return ;
178183 }
179184
180- this . logger . debug ( message , { namespace} ) ;
181- }
182-
183- public error ( message : string , namespace : string = 'z2m' ) : void {
184- this . logger . error ( message , { namespace} ) ;
185+ this . log ( 'debug' , message , namespace ) ;
185186 }
186187
187188 // Cleanup any old log directory.
0 commit comments