From 8c4f5d53467eea4723f63f87702603b28c1dd399 Mon Sep 17 00:00:00 2001 From: rxbn_ Date: Thu, 1 Oct 2020 21:27:20 +0200 Subject: [PATCH] update logs module --- bin/logs/module.js | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/bin/logs/module.js b/bin/logs/module.js index 9481c5c..2750847 100644 --- a/bin/logs/module.js +++ b/bin/logs/module.js @@ -2,12 +2,13 @@ var methods = {}; let fs = require('fs'); let util = require('util'); +var cfg = require(global['__dirname']+'/bin/config'); // save new line to file newLine = (prefix, obj) => { let date = new Date(); // current date - let filename = global['gds'].cfg.log.filename(); // filename - let dir = global['gds'].cfg.log.directory(); // directory + let filename = cfg.log.filename(); // filename + let dir = cfg.log.directory(); // directory let path = dir + filename; // filepath let fs_options = { // fs options for encoding, file mode and file flag encoding: "utf8", @@ -46,7 +47,7 @@ newLine = (prefix, obj) => { } }; -fallback = (fn, ...data) => { +log = (fn, ...data) => { if(data.length == 1) data = data[0]; fn.apply(null, data); @@ -55,8 +56,7 @@ fallback = (fn, ...data) => { // LOG | INFO methods.log = (...data) => { - if(global['modules'].cli) global['modules'].cli.log.apply(global['modules'].cli, data); - else fallback(console.log, data); + log(console.log, data); if(data.length == 1) data = data[0]; newLine(" [LOG]", data); @@ -65,8 +65,7 @@ methods.info = methods.log; // WARNING methods.warn = (...data) => { - if(global['modules'].cli) global['modules'].cli.log.apply(global['modules'].cli, data); - else fallback(console.warn, data); + log(console.warn, data); if(data.length == 1) data = data[0]; newLine(" [WARN]", data); @@ -74,8 +73,7 @@ methods.warn = (...data) => { // ERROR methods.error = (...data) => { - if(global['modules'].cli) global['modules'].cli.log.apply(global['modules'].cli, data); - else fallback(console.error, data); + log(console.error, data); if(data.length == 1) data = data[0]; newLine("[ERROR]", data); @@ -84,9 +82,8 @@ methods.err = methods.error; // DEBUG methods.debug = (...data) => { - if(global['gds'].debug) { - if(global['modules'].cli) global['modules'].cli.log.apply(global['modules'].cli, data); - else fallback(console.log, data); + if(global['debug'] === true) { + log(console.log, data); if(data.length == 1) data = data[0]; newLine("[DEBUG]", data);