File tree Expand file tree Collapse file tree 2 files changed +15
-11
lines changed
Expand file tree Collapse file tree 2 files changed +15
-11
lines changed Original file line number Diff line number Diff line change @@ -9,18 +9,28 @@ export default class Logging {
99
1010 this . reset ( )
1111
12- this . setConfig ( app . loggingConfig )
12+ if ( app . loggingConfig ) {
13+ this . setConfig ( app . loggingConfig )
14+ }
1315 }
1416
1517 setConfig ( config ) {
16- this . config = config
18+ if ( config . levels ) {
19+ this . levels = config . levels
20+ }
21+
22+ if ( config . defaultLevel ) {
23+ this . defaultLevel = config . defaultLevel
24+ }
1725
1826 if ( config . loadLevels ) {
1927 this . loadLoggingLevels ( )
2028 }
2129 }
2230
2331 reset ( ) {
32+ this . levels = { }
33+ this . defaultLevel = 'all'
2434 this . loggers = { }
2535 this . messages = [ ]
2636 this . numOfMessages = 10
@@ -33,10 +43,10 @@ export default class Logging {
3343 . get ( { url : this . app . urls . loggingLevels ( ) } )
3444 . then ( loggers => {
3545 loggers . forEach ( logger => {
36- this . config . levels [ logger . name ] = logger . level
46+ this . levels [ logger . name ] = logger . level
3747 } )
3848
39- this . config . defaultLevel = this . config . levels [ GLOBAL_LOGGER_NAME ] || this . config . defaultLevel
49+ this . defaultLevel = this . levels [ GLOBAL_LOGGER_NAME ] || this . defaultLevel
4050 } )
4151 . catch ( error => {
4252 // eslint-disable-next-line no-console
Original file line number Diff line number Diff line change @@ -47,13 +47,7 @@ export default class Logger {
4747 }
4848
4949 min ( level ) {
50- const configuredLevel = this . logging . config . levels [ this . name ]
51-
52- if ( ! configuredLevel ) {
53- const { defaultLevel } = this . logging . config
54-
55- return LogLevelPriorities [ defaultLevel . toLowerCase ( ) ] >= LogLevelPriorities [ level . toLowerCase ( ) ]
56- }
50+ const configuredLevel = this . logging . levels [ this . name ] || this . logging . defaultLevel
5751
5852 return LogLevelPriorities [ configuredLevel . toLowerCase ( ) ] >= LogLevelPriorities [ level . toLowerCase ( ) ]
5953 }
You can’t perform that action at this time.
0 commit comments