Skip to content

Commit 51664c8

Browse files
committed
Merge pull request #1268 from ParsePlatform/flovilmart.noLogsWhileTesting
Removes all stdout/err logs while testing
2 parents 8c12f80 + 4774e90 commit 51664c8

File tree

1 file changed

+36
-46
lines changed

1 file changed

+36
-46
lines changed

src/logger.js

Lines changed: 36 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,15 @@ if (typeof process !== 'undefined' && process.env.NODE_ENV === 'test') {
1010
}
1111

1212
let currentLogsFolder = LOGS_FOLDER;
13-
var currentTransports;
1413

15-
const logger = new winston.Logger();
16-
17-
export function configureLogger({logsFolder}) {
18-
logsFolder = logsFolder || currentLogsFolder;
19-
20-
if (!path.isAbsolute(logsFolder)) {
21-
logsFolder = path.resolve(process.cwd(), logsFolder);
22-
}
23-
if (!fs.existsSync(logsFolder)) {
24-
fs.mkdirSync(logsFolder);
25-
}
26-
currentLogsFolder = logsFolder;
27-
28-
currentTransports = [
29-
new (winston.transports.Console)({
30-
colorize: true,
31-
level: process.env.VERBOSE ? 'verbose': 'info'
32-
}),
14+
function generateTransports() {
15+
let level = process.env.VERBOSE ? 'verbose': 'info';
16+
let transports = [
3317
new (DailyRotateFile)({
3418
filename: 'parse-server.info',
3519
dirname: currentLogsFolder,
3620
name: 'parse-server',
37-
level: process.env.VERBOSE ? 'verbose': 'info'
21+
level: level
3822
}),
3923
new (DailyRotateFile)({
4024
filename: 'parse-server.err',
@@ -43,44 +27,50 @@ export function configureLogger({logsFolder}) {
4327
level: 'error'
4428
})
4529
]
30+
if (!process.env.TESTING) {
31+
transports = [new (winston.transports.Console)({
32+
colorize: true,
33+
level:level
34+
})].concat(transports);
35+
}
36+
return transports;
37+
}
38+
39+
const logger = new winston.Logger();
40+
41+
export function configureLogger({logsFolder}) {
42+
logsFolder = logsFolder || currentLogsFolder;
43+
44+
if (!path.isAbsolute(logsFolder)) {
45+
logsFolder = path.resolve(process.cwd(), logsFolder);
46+
}
47+
if (!fs.existsSync(logsFolder)) {
48+
fs.mkdirSync(logsFolder);
49+
}
50+
currentLogsFolder = logsFolder;
4651

4752
logger.configure({
48-
transports: currentTransports
53+
transports: generateTransports()
4954
})
5055
}
5156

5257
configureLogger({logsFolder: LOGS_FOLDER});
5358

5459
export function addGroup(groupName) {
5560
let level = process.env.VERBOSE ? 'verbose': 'info';
61+
62+
let transports = generateTransports().concat(new (DailyRotateFile)({
63+
filename: groupName,
64+
dirname: currentLogsFolder,
65+
name: groupName,
66+
level: level
67+
}));
68+
5669
winston.loggers.add(groupName, {
57-
transports: [
58-
new (winston.transports.Console)({
59-
colorize: true,
60-
level: level
61-
}),
62-
new (DailyRotateFile)({
63-
filename: groupName,
64-
dirname: currentLogsFolder,
65-
name: groupName,
66-
level: level
67-
}),
68-
new (DailyRotateFile)({
69-
filename: 'parse-server.info',
70-
name: 'parse-server',
71-
dirname: currentLogsFolder,
72-
level: level
73-
}),
74-
new (DailyRotateFile)({
75-
filename: 'parse-server.err',
76-
dirname: currentLogsFolder,
77-
name: 'parse-server-error',
78-
level: 'error'
79-
})
80-
]
70+
transports: transports
8171
});
8272
return winston.loggers.get(groupName);
8373
}
8474

8575
export { logger };
86-
export default winston;
76+
export default logger;

0 commit comments

Comments
 (0)