Merge branch 'ginkgo-master'

This commit is contained in:
Misha Wolfson 2016-12-14 18:24:43 -05:00
commit 792401402e

View file

@ -13,13 +13,16 @@ var output;
if (config.get('bunyan') || config.get(env + ':use_bunyan')) { if (config.get('bunyan') || config.get(env + ':use_bunyan')) {
var settings = _.cloneDeep(config.get(env + ':bunyan')); var settings = _.cloneDeep(config.get(env + ':bunyan'));
for (var i = 0; i < settings.streams.length; i++) { // Stream can be specified either in settings.streams[ix] or globally in settings.stream
if (settings.streams[i].stream === 'process.stdout') { _([settings.streams, settings])
settings.streams[i].stream = process.stdout; .flatten()
} else if (settings.streams[i].stream === 'process.stderr') { .forEach(function (settingObj) {
settings.streams[i].stream = process.stderr; if (settingObj.stream === 'process.stdout') {
} settingObj.stream = process.stdout;
} } else if (settingObj.stream === 'process.stderr') {
settingObj.stream = process.stderr;
}
});
output = bunyan.createLogger(settings); output = bunyan.createLogger(settings);
} else { } else {