Skip to content

Commit 4008762

Browse files
committed
Delegate dates logging to process manager in prod
1 parent 4481873 commit 4008762

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

scripts/dataset/logger/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ logger.format = combine(
1010
printf(({ level, message, counter, hash, timestamp }) => {
1111
const prefix = counter && hash ? `${counter.toString().padEnd(6)} ${hash.padEnd(40)}` : '';
1212

13-
return `${timestamp} ${level.padEnd(15)} ${prefix.padEnd(50)} ${message}`;
13+
const timestampPrefix = process.env.NODE_ENV !== 'production' ? `${timestamp} ` : '';
14+
15+
return `${timestampPrefix}${level.padEnd(15)} ${prefix.padEnd(50)} ${message}`;
1416
}),
1517
);
1618

src/collection-api/logger.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ const logger = winston.createLogger({
3131
format: combine(
3232
colorize(),
3333
timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
34-
printf(({ level, message, timestamp }) => `${timestamp} ${level.padEnd(15)} ${message}`),
34+
printf(({ level, message, timestamp }) => {
35+
const timestampPrefix = process.env.NODE_ENV !== 'production' ? `${timestamp} ` : '';
36+
37+
return `${timestampPrefix}${level.padEnd(15)} ${message}`;
38+
}),
3539
),
3640
transports,
3741
rejectionHandlers: transports,

src/logger/index.js

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,15 @@ const alignedWithColorsAndTime = combine(
1010
colorize(),
1111
timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
1212
printf(({ level, message, timestamp, serviceId, termsType, documentId }) => {
13-
let prefix = '';
13+
const servicePrefix = serviceId && termsType
14+
? `${serviceId}${termsType}${documentId ? `:${documentId}` : ''}`
15+
: '';
1416

15-
if (serviceId && termsType) {
16-
prefix = `${serviceId}${termsType}`;
17-
}
18-
19-
if (documentId) {
20-
prefix = `${prefix}:${documentId}`;
21-
}
17+
const truncatedPrefix = servicePrefix.length > 75 ? `${servicePrefix.slice(0, 74)}…` : servicePrefix;
2218

23-
if (prefix.length > 75) {
24-
prefix = `${prefix.substring(0, 74)}…`;
25-
}
19+
const timestampPrefix = process.env.NODE_ENV !== 'production' ? `${timestamp} ` : '';
2620

27-
return `${timestamp} ${level.padEnd(15)} ${prefix.padEnd(75)} ${message}`;
21+
return `${timestampPrefix}${level.padEnd(15)} ${truncatedPrefix.padEnd(75)} ${message}`;
2822
}),
2923
);
3024

0 commit comments

Comments
 (0)