From 10acf28fa6cafc0331b1ffeb3d1aebd4a1bf88a8 Mon Sep 17 00:00:00 2001 From: Nicholas Wallace Date: Sat, 8 Mar 2025 12:46:36 -0700 Subject: [PATCH] Simplify log level determination --- server/Logger.js | 7 +------ server/scanner/LibraryScan.js | 12 +----------- server/scanner/ScanLogger.js | 18 ++++-------------- 3 files changed, 6 insertions(+), 31 deletions(-) diff --git a/server/Logger.js b/server/Logger.js index e4487f0a..3589dc19 100644 --- a/server/Logger.js +++ b/server/Logger.js @@ -21,12 +21,7 @@ class Logger { } get levelString() { - for (const key in LogLevel) { - if (LogLevel[key] === this.logLevel) { - return key - } - } - return 'UNKNOWN' + return this.getLogLevelString(this.logLevel) } /** diff --git a/server/scanner/LibraryScan.js b/server/scanner/LibraryScan.js index 220c6eb4..e77f30ba 100644 --- a/server/scanner/LibraryScan.js +++ b/server/scanner/LibraryScan.js @@ -4,7 +4,6 @@ const fs = require('../libs/fsExtra') const date = require('../libs/dateAndTime') const Logger = require('../Logger') -const { LogLevel } = require('../utils/constants') const { secondsToTimestamp, elapsedPretty } = require('../utils/index') class LibraryScan { @@ -109,20 +108,11 @@ class LibraryScan { this.elapsed = this.finishedAt - this.startedAt } - getLogLevelString(level) { - for (const key in LogLevel) { - if (LogLevel[key] === level) { - return key - } - } - return 'UNKNOWN' - } - addLog(level, ...args) { const logObj = { timestamp: this.timestamp, message: args.join(' '), - levelName: this.getLogLevelString(level), + levelName: Logger.getLogLevelString(level), level } diff --git a/server/scanner/ScanLogger.js b/server/scanner/ScanLogger.js index 90f8a28b..7aed21f1 100644 --- a/server/scanner/ScanLogger.js +++ b/server/scanner/ScanLogger.js @@ -1,6 +1,5 @@ -const uuidv4 = require("uuid").v4 +const uuidv4 = require('uuid').v4 const Logger = require('../Logger') -const { LogLevel } = require('../utils/constants') class ScanLogger { constructor() { @@ -44,20 +43,11 @@ class ScanLogger { this.elapsed = this.finishedAt - this.startedAt } - getLogLevelString(level) { - for (const key in LogLevel) { - if (LogLevel[key] === level) { - return key - } - } - return 'UNKNOWN' - } - addLog(level, ...args) { const logObj = { - timestamp: (new Date()).toISOString(), + timestamp: new Date().toISOString(), message: args.join(' '), - levelName: this.getLogLevelString(level), + levelName: Logger.getLogLevelString(level), level } @@ -67,4 +57,4 @@ class ScanLogger { this.logs.push(logObj) } } -module.exports = ScanLogger \ No newline at end of file +module.exports = ScanLogger