@@ -11,11 +11,11 @@ const logLevels = {error: 3, err: 3, warning: 4, warn: 4, notice: 5, info: 6, de
11
11
let logger ;
12
12
13
13
const enrichLogInfo = format ( function ( info , options ) {
14
- info . level = info . level . toUpperCase ( ) ;
14
+ const metadata = { ... info . metadata } ;
15
15
16
+ info . level = info . level . toUpperCase ( ) ;
16
17
info . thread = electron . remote ? electron . remote . getCurrentWindow ( ) . id : 'main' ;
17
- if ( ! info . category ) info . category = 'category' ;
18
- const metadata = info . metadata ;
18
+ info . category = metadata . category || 'N/A' ;
19
19
delete metadata . category ;
20
20
21
21
info . meta = '' ;
@@ -39,9 +39,9 @@ const cloneErrors = format(function(info, options) {
39
39
var value = srcValue [ prop ] ;
40
40
41
41
clone [ prop ] = value && typeof value === 'object' ?
42
- // Recurse for objects, to handle inner exceptions
43
- mergeWith ( { } , value , errorCloner ) :
44
- value ;
42
+ // Recurse for objects, to handle inner exceptions
43
+ mergeWith ( { } , value , errorCloner ) :
44
+ value ;
45
45
} ) ;
46
46
47
47
return clone ;
@@ -61,6 +61,11 @@ module.exports = function(config, logfile) {
61
61
logger = createLogger ( {
62
62
levels : logLevels ,
63
63
transports : [ ] ,
64
+ format : format . combine (
65
+ format . metadata ( ) ,
66
+ cloneErrors ( ) ,
67
+ enrichLogInfo ( )
68
+ )
64
69
} ) ;
65
70
66
71
if ( env . context !== 'test' ) {
@@ -72,22 +77,14 @@ module.exports = function(config, logfile) {
72
77
tailable : true ,
73
78
zippedArchive : false ,
74
79
format : format . combine (
75
- format . metadata ( ) ,
76
- cloneErrors ( ) ,
77
80
format . timestamp ( { format : 'YYYY-MM-DD HH:mm:ss' } ) ,
78
- enrichLogInfo ( ) ,
79
81
format . printf ( info => `${ info . timestamp } ${ info . level } <${ info . thread } > [${ info . category } ]: ${ info . message } ${ info . meta } ` )
80
82
) ,
81
83
} ) ) ;
82
84
83
85
if ( logfile === 'sync.log' ) {
84
86
logger . add ( new TrayTransport ( {
85
87
level : 'error' ,
86
- config,
87
- format : format . combine (
88
- format . metadata ( ) ,
89
- cloneErrors ( ) ,
90
- )
91
88
} ) ) ;
92
89
}
93
90
}
@@ -96,9 +93,6 @@ module.exports = function(config, logfile) {
96
93
logger . add ( new transports . Console ( {
97
94
level : 'debug' ,
98
95
format : format . combine (
99
- format . metadata ( ) ,
100
- cloneErrors ( ) ,
101
- enrichLogInfo ( ) ,
102
96
format . colorize ( ) ,
103
97
format . printf ( info => `${ info . level } <${ info . thread } > [${ info . category } ]: ${ info . message } ${ info . meta } ` )
104
98
) ,
0 commit comments