Cutlery/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2025-10-31 10:27:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4089 from nichwall/logger_cleanup

Browse Source 
Simplify log level determination
This commit is contained in:
advplyr 2025-03-08 17:25:42 -06:00 committed by GitHub
commit e93b18745e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/Logger.js
View File

@ -21,12 +21,7 @@ class Logger {
} }
get levelString() { get levelString() {
for (const key in LogLevel) { return this.getLogLevelString(this.logLevel)
if (LogLevel[key] === this.logLevel) {
return key
}
}
return 'UNKNOWN'
} }
/** /**

12
server/scanner/LibraryScan.js
View File

@ -4,7 +4,6 @@ const fs = require('../libs/fsExtra')
const date = require('../libs/dateAndTime') const date = require('../libs/dateAndTime')
const Logger = require('../Logger') const Logger = require('../Logger')
const { LogLevel } = require('../utils/constants')
const { secondsToTimestamp, elapsedPretty } = require('../utils/index') const { secondsToTimestamp, elapsedPretty } = require('../utils/index')
class LibraryScan { class LibraryScan {
@ -109,20 +108,11 @@ class LibraryScan {
this.elapsed = this.finishedAt - this.startedAt this.elapsed = this.finishedAt - this.startedAt
} }
getLogLevelString(level) {
for (const key in LogLevel) {
if (LogLevel[key] === level) {
return key
}
}
return 'UNKNOWN'
}
addLog(level, ...args) { addLog(level, ...args) {
const logObj = { const logObj = {
timestamp: this.timestamp, timestamp: this.timestamp,
message: args.join(' '), message: args.join(' '),
levelName: this.getLogLevelString(level), levelName: Logger.getLogLevelString(level),
level level
} }

18
server/scanner/ScanLogger.js
View File

@ -1,6 +1,5 @@
const uuidv4 = require("uuid").v4 const uuidv4 = require('uuid').v4
const Logger = require('../Logger') const Logger = require('../Logger')
const { LogLevel } = require('../utils/constants')
class ScanLogger { class ScanLogger {
constructor() { constructor() {
@ -44,20 +43,11 @@ class ScanLogger {
this.elapsed = this.finishedAt - this.startedAt this.elapsed = this.finishedAt - this.startedAt
} }
getLogLevelString(level) {
for (const key in LogLevel) {
if (LogLevel[key] === level) {
return key
}
}
return 'UNKNOWN'
}
addLog(level, ...args) { addLog(level, ...args) {
const logObj = { const logObj = {
timestamp: (new Date()).toISOString(), timestamp: new Date().toISOString(),
message: args.join(' '), message: args.join(' '),
levelName: this.getLogLevelString(level), levelName: Logger.getLogLevelString(level),
level level
} }
@ -67,4 +57,4 @@ class ScanLogger {
this.logs.push(logObj) this.logs.push(logObj)
} }
} }
module.exports = ScanLogger module.exports = ScanLogger