Skip to content

Commit

Permalink
Fix logger
Browse files Browse the repository at this point in the history
  • Loading branch information
Levminer committed Mar 18, 2022
1 parent a16fe5e commit 0115efe
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 23 deletions.
12 changes: 6 additions & 6 deletions lib/logger/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = logger = {
*/
log: (message, log) => {
if (typeof log === "object") {
log = JSON.stringify(log)
log = JSON.stringify(log, null, "\t")
} else if (typeof log === "undefined") {
log = undefined
}
Expand Down Expand Up @@ -60,7 +60,7 @@ module.exports = logger = {
*/
rendererLog: (id, message, log) => {
if (typeof log === "object") {
log = JSON.stringify(log)
log = JSON.stringify(log, null, "\t")
} else if (typeof log === "undefined") {
log = undefined
}
Expand Down Expand Up @@ -88,7 +88,7 @@ module.exports = logger = {
*/
warn: (message, warn) => {
if (typeof warn === "object") {
warn = JSON.stringify(warn)
warn = JSON.stringify(warn, null, "\t")
} else if (typeof warn === "undefined") {
warn = undefined
}
Expand Down Expand Up @@ -117,7 +117,7 @@ module.exports = logger = {
*/
rendererWarn: (id, message, warn) => {
if (typeof warn === "object") {
warn = JSON.stringify(warn)
warn = JSON.stringify(warn, null, "\t")
} else if (typeof warn === "undefined") {
warn = undefined
}
Expand Down Expand Up @@ -145,7 +145,7 @@ module.exports = logger = {
*/
error: (message, error) => {
if (typeof error === "object") {
error = JSON.stringify(error)
error = JSON.stringify(error, null, "\t")
} else if (typeof error === "undefined") {
error = undefined
}
Expand Down Expand Up @@ -174,7 +174,7 @@ module.exports = logger = {
*/
rendererError: (id, message, error) => {
if (typeof error === "object") {
error = JSON.stringify(error)
error = JSON.stringify(error, null, "\t")
} else if (typeof error === "undefined") {
error = undefined
}
Expand Down
25 changes: 11 additions & 14 deletions lib/logger/renderer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,34 @@ module.exports = {
/**
* Writes a log to the console
* @param {string} message
* @param {string|object} log
* @return {string} log
* @param {string|object} arg
*/
log: (message, log) => {
log: (message, arg) => {
console.log(message)

electron.ipcRenderer.send("loggerLog", { id: window, message, log })
electron.ipcRenderer.send("loggerLog", { window, message, arg })
},

/**
* Writes a warn to the console
* @param {string} message
* @param {string|object} warn
* @return {string} warn
* @param {string|object} arg
*/
warn: (message, warn) => {
console.warn(message)
warn: (message, arg) => {
console.log(message)

electron.ipcRenderer.send("loggerWarn", { id: window, message, warn })
electron.ipcRenderer.send("loggerWarn", { window, message, arg })
},

/**
* Writes a error to the console
* Writes an error to the console
* @param {string} message
* @param {string|object} error
* @return {string} error
* @param {string|object} arg
*/
error: (message, error) => {
error: (message, arg) => {
console.error(message)

electron.ipcRenderer.send("loggerError", { id: window, message, error })
electron.ipcRenderer.send("loggerError", { window, message, arg })
},

/**
Expand Down
6 changes: 3 additions & 3 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -1560,15 +1560,15 @@ ipc.on("rendererError", async (event, data) => {
* Logger events
*/
ipc.on("loggerLog", (event, data) => {
logger.rendererLog(data.id, data.message, data.log)
logger.rendererLog(data.window, data.message, data.arg)
})

ipc.on("loggerWarn", (event, data) => {
logger.rendererWarn(data.id, data.message, data.warn)
logger.rendererWarn(data.window, data.message, data.arg)
})

ipc.on("loggerError", (event, data) => {
logger.rendererError(data.id, data.message, data.error)
logger.rendererError(data.window, data.message, data.arg)
})

/**
Expand Down

0 comments on commit 0115efe

Please sign in to comment.