mirror of
https://github.com/advplyr/audiobookshelf.git
synced 2025-05-13 01:19:55 +02:00
Merge pull request #4089 from nichwall/logger_cleanup
Simplify log level determination
This commit is contained in:
commit
e93b18745e
@ -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'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user