From 5220859984a9a20c575a294e5825b3e0d756b03b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 12 Jul 2022 16:21:13 +0200 Subject: Fix log parser with multiple files --- scripts/parse-log.ts | 62 ++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 29 deletions(-) (limited to 'scripts') diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts index 7a50d9f2f..5a420a46c 100755 --- a/scripts/parse-log.ts +++ b/scripts/parse-log.ts @@ -76,44 +76,48 @@ run() .then(() => process.exit(0)) .catch(err => console.error(err)) -function run () { - return new Promise(async res => { - const files = await getFiles() +async function run () { + const files = await getFiles() - for (const file of files) { - if (file === 'peertube-audit.log') continue + for (const file of files) { + if (file === 'peertube-audit.log') continue - console.log('Opening %s.', file) - - const stream = createReadStream(file) + await readFile(file) + } +} - const rl = createInterface({ - input: stream - }) +function readFile (file: string) { + console.log('Opening %s.', file) - rl.on('line', line => { - try { - const log = JSON.parse(line) - if (options.tags && !containsTags(log.tags, options.tags)) { - return - } + const stream = createReadStream(file) - if (options.notTags && containsTags(log.tags, options.notTags)) { - return - } + const rl = createInterface({ + input: stream + }) - // Don't know why but loggerFormat does not remove splat key - Object.assign(log, { splat: undefined }) + return new Promise(res => { + rl.on('line', line => { + try { + const log = JSON.parse(line) + if (options.tags && !containsTags(log.tags, options.tags)) { + return + } - logLevels[log.level](log) - } catch (err) { - console.error('Cannot parse line.', inspect(line)) - throw err + if (options.notTags && containsTags(log.tags, options.notTags)) { + return } - }) - stream.once('close', () => res()) - } + // Don't know why but loggerFormat does not remove splat key + Object.assign(log, { splat: undefined }) + + logLevels[log.level](log) + } catch (err) { + console.error('Cannot parse line.', inspect(line)) + throw err + } + }) + + stream.once('close', () => res()) }) } -- cgit v1.2.3