Skip to content

Commit 39f0000

Browse files
committed
Do not use format.json() in logger
Resolves: #228
1 parent eca2614 commit 39f0000

File tree

2 files changed

+12
-17
lines changed

2 files changed

+12
-17
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Bugfixes
66
* Logger should be able to serialize BigInt #229
7+
* Do not use format.json() in logger #228
78

89
### Changes
910
* Upgrade to electron v7 #132

app/lib/logger-factory.js

+11-17
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ const logLevels = {error: 3, err: 3, warning: 4, warn: 4, notice: 5, info: 6, de
1111
let logger;
1212

1313
const enrichLogInfo = format(function(info, options) {
14-
info.level = info.level.toUpperCase();
14+
const metadata = {...info.metadata};
1515

16+
info.level = info.level.toUpperCase();
1617
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';
1919
delete metadata.category;
2020

2121
info.meta = '';
@@ -39,9 +39,9 @@ const cloneErrors = format(function(info, options) {
3939
var value = srcValue[prop];
4040

4141
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;
4545
});
4646

4747
return clone;
@@ -61,6 +61,11 @@ module.exports = function(config, logfile) {
6161
logger = createLogger({
6262
levels: logLevels,
6363
transports: [],
64+
format: format.combine(
65+
format.metadata(),
66+
cloneErrors(),
67+
enrichLogInfo()
68+
)
6469
});
6570

6671
if(env.context !== 'test') {
@@ -72,22 +77,14 @@ module.exports = function(config, logfile) {
7277
tailable: true,
7378
zippedArchive: false,
7479
format: format.combine(
75-
format.metadata(),
76-
cloneErrors(),
7780
format.timestamp({format: 'YYYY-MM-DD HH:mm:ss'}),
78-
enrichLogInfo(),
7981
format.printf(info => `${info.timestamp} ${info.level} <${info.thread}> [${info.category}]: ${info.message} ${info.meta}`)
8082
),
8183
}));
8284

8385
if(logfile === 'sync.log') {
8486
logger.add(new TrayTransport({
8587
level: 'error',
86-
config,
87-
format: format.combine(
88-
format.metadata(),
89-
cloneErrors(),
90-
)
9188
}));
9289
}
9390
}
@@ -96,9 +93,6 @@ module.exports = function(config, logfile) {
9693
logger.add(new transports.Console({
9794
level: 'debug',
9895
format: format.combine(
99-
format.metadata(),
100-
cloneErrors(),
101-
enrichLogInfo(),
10296
format.colorize(),
10397
format.printf(info => `${info.level} <${info.thread}> [${info.category}]: ${info.message} ${info.meta}`)
10498
),

0 commit comments

Comments
 (0)