mirror of
				https://github.com/advplyr/audiobookshelf.git
				synced 2025-10-27 11:18:14 +01: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() {
 | 
			
		||||
    for (const key in LogLevel) {
 | 
			
		||||
      if (LogLevel[key] === this.logLevel) {
 | 
			
		||||
        return key
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
    return 'UNKNOWN'
 | 
			
		||||
    return this.getLogLevelString(this.logLevel)
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
module.exports = ScanLogger
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user