Fix: correctly stringify log messages.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "berlin-lea-performance-monitor",
-  "version": "1.20.0",
+  "version": "1.20.1",
   "author": "David Leclerc",
   "main": "./src/index.ts",
   "scripts": {

src/logger.ts

@@ -49,7 +49,7 @@ const getLoggerByUseCase = () => {
     // When polling, output all logs to file and terminal
     if (POLL) {
         return pino({
-            level: 'trace',
+            level: 'debug',
             formatters: FORMATTERS,
             timestamp: pino.stdTimeFunctions.isoTime,
         }, pino.transport({

src/models/logs/Log.ts

@@ -35,18 +35,24 @@ class Log {
     }
 
     public static fromText(line: string, index: number) {
-        const { level, time, version, pid, hostname, msg, err } = JSON.parse(line);
-
-        return new Log({
-            line: index + 1,
-            level,
-            time: new Date(time),
-            version: Release.fromString(version),
-            processId: pid,
-            hostname,
-            message: msg,
-            error: err,
-        });
+        try {
+            const { level, time, version, pid, hostname, msg, err } = JSON.parse(line);
+
+            return new Log({
+                line: index + 1,
+                level,
+                time: new Date(time),
+                version: Release.fromString(version),
+                processId: pid,
+                hostname,
+                message: msg,
+                error: err,
+            });
+
+        // Ignore problematic lines
+        } catch (err: unknown) {
+
+        }
     }
 
     public toString() {
@@ -57,7 +63,7 @@ class Log {
             `"hostname":"${this.hostname}",` +
             `"version":"${this.version.toString()}",` +
             (this.error ? `"err":"${this.error}",` : '') +
-            `"msg":"${this.message}"` +
+            `"msg":${JSON.stringify(this.message)}` +
         `}`);
     }
 

src/utils/file.ts

@@ -59,7 +59,7 @@ export const doesFileExist = (filepath: string) => {
     return fs.existsSync(filepath);
 }
 
-export const touchFile = async (filepath: string) => {
+export const touchFile = (filepath: string) => {
     if (!doesFileExist(filepath)) {
         fs.mkdirSync(path.dirname(filepath), { recursive: true });
 

src/utils/parsing.ts

@@ -3,10 +3,13 @@ import { NEW_LINE_REGEXP } from '../constants';
 import logger from '../logger';
 import Release from '../models/Release';
 import { readFile } from './file';
+import pino from 'pino';
 
+const LEVEL_MAP = pino.levels.values;
 
 
-export const parseLogs = async (filepath: string, since?: Date | Release) => {
+
+export const parseLogs = async (filepath: string, since?: Date | Release, level?: pino.Level) => {
     logger.trace(`Reading logs...`);
 
     if (since) {
@@ -17,16 +20,24 @@ export const parseLogs = async (filepath: string, since?: Date | Release) => {
         }
     }
 
+    if (level) {
+        logger.debug(`Keeping logs with level greater than or equal to: ${LEVEL_MAP[level]} (${level.toUpperCase()})`);
+    }
+
     const file = await readFile(filepath);
 
-    const logs: Log[] = file
+    const rawLogs = file
         .split(NEW_LINE_REGEXP)
         .filter((line: string) => {
             return line.startsWith('{') && line.endsWith('}');
         })
         .map((line: string, index: number) => {
             return Log.fromText(line, index);
         })
+        .filter(Boolean) as Log[];
+
+    const logs = rawLogs
+        .filter((log: Log) => level === undefined || log.getLevel() >= LEVEL_MAP[level])
         .filter((log: Log) => {
             if (since instanceof Date) {
                 return log.getTime() >= since;