feat: reduce log verbosity

remotes/origin/dependabot/npm_and_yarn/redis-3.1.1
Daniel García Aubert 4 years ago
parent 204650c44c
commit 935f08c5b5

@ -5,6 +5,7 @@ module.exports = function logReqRes ({ logOnEvent = 'finish' } = {}) {
const { logger } = res.locals;
logger.info({ client_request: req }, 'Incoming request');
res.on(logOnEvent, () => logger.info({ server_response: res, status: res.statusCode }, 'Response sent'));
res.on('close', () => res.locals.logger.info({ end: true }, 'Request done'));
next();
};
};

@ -29,7 +29,7 @@ module.exports = class Logger {
serializers: {
client_request: requestSerializer,
server_response: responseSerializer,
exception: errorSerializer
exception: (err) => Array.isArray(err) ? err.map((err) => errorSerializer(err)) : [errorSerializer(err)]
}
};
const dest = pino.destination({ sync: false }); // stdout

@ -0,0 +1,105 @@
'use strict'
const fs = require('fs');
const split = require('split2');
const assingDeep = require('assign-deep');
const { Transform } = require('stream');
const DEV_ENVS = ['test', 'development'];
const dumpPath = `${__dirname}/dump.json`;
let logs;
const LEVELS = {
'trace': 10,
'debug': 20,
'info': 30,
'warning': 40,
'error': 50,
'fatal': 60
};
module.exports = function logCollector () {
const stream = new Transform({
transform (chunk, enc, callback) {
let entry;
try {
entry = JSON.parse(chunk);
const { levelname, timestamp } = entry;
if (levelname === undefined && timestamp === undefined) {
throw new Error('Entry log is not valid');
}
} catch (e) {
if (DEV_ENVS.includes(process.env.NODE_ENV)) {
this.push(chunk + '\n');
}
return callback();
}
const { request_id: id } = entry;
if (id === undefined) {
this.push(`${JSON.stringify(entry)}\n`);
return callback();
}
if (logs.has(id)) {
const accEntry = logs.get(id);
const { end } = entry;
if (end === true) {
accEntry.timestamp = entry.timestamp;
accEntry.event_message = entry.event_message;
this.push(`${JSON.stringify(accEntry)}\n`);
logs.delete(id);
return callback();
}
if (LEVELS[accEntry.levelname] > LEVELS[entry.levelname]) {
delete entry.levelname;
}
if (hasProperty(accEntry, 'exception') && hasProperty(entry, 'exception')) {
logs.set(id, assingDeep({}, accEntry, entry, { exception: accEntry.exception.concat(entry.exception) }));
} else {
logs.set(id, assingDeep({}, accEntry, entry));
}
} else {
logs.set(id, entry);
}
callback();
}
});
stream.on('pipe', () => {
if (!fs.existsSync(dumpPath)) {
logs = new Map();
return;
}
try {
const dump = require(dumpPath);
logs = new Map(dump);
} catch (err) {
console.error(`Cannot read the dump for unfinished logs: ${err}`);
logs = new Map();
}
});
stream.on('unpipe', () => {
try {
fs.writeFileSync(dumpPath, JSON.stringify([...logs]));
} catch (err) {
console.error(`Cannot create a dump for unfinished logs: ${err}`);
}
});
return stream;
};
function hasProperty (obj, prop) {
return Object.prototype.hasOwnProperty.call(obj, prop);
}

@ -4,6 +4,7 @@ const util = require('util');
const stream = require('stream');
const pipeline = util.promisify(stream.pipeline);
const split = require('split2');
const logCollector = require('./log-collector');
const MetricsCollector = require('./metrics-collector');
module.exports = async function metro ({ input = process.stdin, output = process.stdout, metrics = {} } = {}) {
@ -12,7 +13,7 @@ module.exports = async function metro ({ input = process.stdin, output = process
try {
await metricsCollector.start();
await pipeline(input, split(), metricsStream, output);
await pipeline(input, split(), logCollector(), metricsStream, output);
} finally {
await metricsCollector.stop();
}

Loading…
Cancel
Save