extern/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2024-12-26 16:48:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for windows, update regex to only include line number, move to end of log

Browse Source
This commit is contained in:
advplyr 2023-01-05 16:44:34 -06:00
parent 10fd51498c
commit 3426832f2b
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/Logger.js
View File

@ -24,9 +24,10 @@ class Logger {
get source() { get source() {
try { try {
throw new Error(); throw new Error()
} catch (error) { } catch (error) {
return error.stack.split('\n')[3].replace(/^.*\/([^/]*:[0-9]*:[[0-9]*)\)*/, '$1') const regex = global.isWin ? /^.*\\([^\\:]*:[0-9]*):[0-9]*\)*/ : /^.*\/([^/:]*:[0-9]*):[0-9]*\)*/
return error.stack.split('\n')[3].replace(regex, '$1')
} }
} }
@ -87,41 +88,41 @@ class Logger {
trace(...args) { trace(...args) {
if (this.logLevel > LogLevel.TRACE) return if (this.logLevel > LogLevel.TRACE) return
console.trace(`[${this.timestamp}[ (${this.source}) TRACE:`, ...args) console.trace(`[${this.timestamp}[ TRACE:`, ...args)
this.handleLog(LogLevel.TRACE, args) this.handleLog(LogLevel.TRACE, args)
} }
debug(...args) { debug(...args) {
if (this.logLevel > LogLevel.DEBUG) return if (this.logLevel > LogLevel.DEBUG) return
console.debug(`[${this.timestamp}[ (${this.source}) DEBUG:`, ...args) console.debug(`[${this.timestamp}] DEBUG:`, ...args, `(${this.source})`)
this.handleLog(LogLevel.DEBUG, args) this.handleLog(LogLevel.DEBUG, args)
} }
info(...args) { info(...args) {
if (this.logLevel > LogLevel.INFO) return if (this.logLevel > LogLevel.INFO) return
console.info(`[${this.timestamp}] (${this.source}) INFO:`, ...args) console.info(`[${this.timestamp}] INFO:`, ...args)
this.handleLog(LogLevel.INFO, args) this.handleLog(LogLevel.INFO, args)
} }
warn(...args) { warn(...args) {
if (this.logLevel > LogLevel.WARN) return if (this.logLevel > LogLevel.WARN) return
console.warn(`[${this.timestamp}] (${this.source}) WARN:`, ...args) console.warn(`[${this.timestamp}] WARN:`, ...args, `(${this.source})`)
this.handleLog(LogLevel.WARN, args) this.handleLog(LogLevel.WARN, args)
} }
error(...args) { error(...args) {
if (this.logLevel > LogLevel.ERROR) return if (this.logLevel > LogLevel.ERROR) return
console.error(`[${this.timestamp}] (${this.source}) ERROR:`, ...args) console.error(`[${this.timestamp}] ERROR:`, ...args, `(${this.source})`)
this.handleLog(LogLevel.ERROR, args) this.handleLog(LogLevel.ERROR, args)
} }
fatal(...args) { fatal(...args) {
console.error(`[${this.timestamp}] (${this.source}) FATAL:`, ...args) console.error(`[${this.timestamp}] FATAL:`, ...args, `(${this.source})`)
this.handleLog(LogLevel.FATAL, args) this.handleLog(LogLevel.FATAL, args)
} }
note(...args) { note(...args) {
console.log(`[${this.timestamp}] (${this.source}) NOTE:`, ...args) console.log(`[${this.timestamp}] NOTE:`, ...args)
this.handleLog(LogLevel.NOTE, args) this.handleLog(LogLevel.NOTE, args)
} }
} }

1
server/Server.js
View File

@ -41,6 +41,7 @@ class Server {
this.Port = PORT this.Port = PORT
this.Host = HOST this.Host = HOST
global.Source = SOURCE global.Source = SOURCE
global.isWin = process.platform === 'win32'
global.Uid = isNaN(UID) ? 0 : Number(UID) global.Uid = isNaN(UID) ? 0 : Number(UID)
global.Gid = isNaN(GID) ? 0 : Number(GID) global.Gid = isNaN(GID) ? 0 : Number(GID)
global.ConfigPath = Path.normalize(CONFIG_PATH) global.ConfigPath = Path.normalize(CONFIG_PATH)