PerfCloud/nodelogging
1
0
Fork 0
mirror of https://git.stamm.me/OpenServer/NodeLogging.git synced 2024-11-22 13:29:23 +00:00
Code Issues Releases Wiki Activity

Adding config option to set console output name for additional Logging objects.

Browse Source
This commit is contained in:
Fabian Stamm 2018-09-01 16:45:22 +02:00
parent cf4938d0db
commit 4918fe9b17
5 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
out/index.d.ts vendored
View File

@ -26,6 +26,10 @@ export declare const Colors: {
BgWhite: string; BgWhite: string;
}; };
export interface LoggingBaseOptions { export interface LoggingBaseOptions {
/**
* Name will be prefixed on Console output
*/
name: string;
logfile: string; logfile: string;
errorfile: string; errorfile: string;
console_out: boolean; console_out: boolean;

23
out/index.js
View File

@ -42,6 +42,7 @@ class LoggingBase {
if (!options) if (!options)
options = {}; options = {};
this.config = Object.assign({ this.config = Object.assign({
name: undefined,
console_out: true, console_out: true,
logfile: "./logs/all.log", logfile: "./logs/all.log",
errorfile: "./logs/error.log" errorfile: "./logs/error.log"
@ -137,8 +138,12 @@ class LoggingBase {
let date = new Date().toISOString().replace(/T/, ' ').replace(/\..+/, ''); let date = new Date().toISOString().replace(/T/, ' ').replace(/\..+/, '');
let prefix = `[${LoggingTypes[type]}][${file.file}:${file.line}][${date}]: `; let prefix = `[${LoggingTypes[type]}][${file.file}:${file.line}][${date}]: `;
let message_lines = mb.split("\n").map(line => prefix + line); let message_lines = mb.split("\n").map(line => prefix + line);
if (this.config.console_out) if (this.config.console_out) {
message_lines.forEach(line => console.log(consoleLogFormat + line + exports.Colors.Reset)); let prefix = "";
if (this.config.name)
prefix = `[${this.config.name}]`;
message_lines.forEach(line => console.log(consoleLogFormat + prefix + line + exports.Colors.Reset));
}
let m = message_lines.join("\n"); let m = message_lines.join("\n");
let index = m.indexOf("\x1b"); let index = m.indexOf("\x1b");
while (index >= 0) { while (index >= 0) {
@ -227,20 +232,6 @@ class LoggingBase {
} }
} }
return { stream: fs.createWriteStream(file, { flags: "a" }), size: size }; return { stream: fs.createWriteStream(file, { flags: "a" }), size: size };
// if (await fsExists(this.logFileLocation + "error.log")) {
// let stats = await fsStat(this.logFileLocation + "error.log")
// if (stats.size > maxFileSize) {
// if (await fsExists(this.logFileLocation + "error.log.old"))
// await fsUnlink(this.logFileLocation + "error.log.old");
// await fsMove(this.logFileLocation + "error.log", this.logFileLocation + "error.log.old")
// } else {
// this.errorSize = stats.size;
// }
// }
// this.fileStream = fs.createWriteStream(this.logFileLocation + "all.log", { flags: "a" });
// this.errorStream = fs.createWriteStream(this.logFileLocation + "error.log", { flags: "a" });
// this.writing = false;
// this.checkQueue();
} }
catch (e) { catch (e) {
console.log(e); console.log(e);

2
out/index.js.map
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@hibas123/nodelogging", "name": "@hibas123/nodelogging",
"version": "1.3.3", "version": "1.3.4",
"description": "", "description": "",
"main": "out/index.js", "main": "out/index.js",
"types": "out/index.d.ts", "types": "out/index.d.ts",

27
src/index.ts
View File

@ -37,6 +37,10 @@ const maxFileSize = 500000000;
const OriginalErrorStackFunction = (<any>Error.prototype).prepareStackTrace const OriginalErrorStackFunction = (<any>Error.prototype).prepareStackTrace
export interface LoggingBaseOptions { export interface LoggingBaseOptions {
/**
* Name will be prefixed on Console output
*/
name: string,
logfile: string; logfile: string;
errorfile: string; errorfile: string;
console_out: boolean; console_out: boolean;
@ -56,6 +60,7 @@ export class LoggingBase {
constructor(options?: Partial<LoggingBaseOptions>) { constructor(options?: Partial<LoggingBaseOptions>) {
if (!options) options = {}; if (!options) options = {};
this.config = Object.assign(<LoggingBaseOptions>{ this.config = Object.assign(<LoggingBaseOptions>{
name: undefined,
console_out: true, console_out: true,
logfile: "./logs/all.log", logfile: "./logs/all.log",
errorfile: "./logs/error.log" errorfile: "./logs/error.log"
@ -161,7 +166,11 @@ export class LoggingBase {
let prefix = `[${LoggingTypes[type]}][${file.file}:${file.line}][${date}]: `; let prefix = `[${LoggingTypes[type]}][${file.file}:${file.line}][${date}]: `;
let message_lines = mb.split("\n").map(line => prefix + line); let message_lines = mb.split("\n").map(line => prefix + line);
if (this.config.console_out) message_lines.forEach(line => console.log(consoleLogFormat + line + Colors.Reset)); if (this.config.console_out) {
let prefix = "";
if (this.config.name) prefix = `[${this.config.name}]`;
message_lines.forEach(line => console.log(consoleLogFormat + prefix + line + Colors.Reset));
}
let m = message_lines.join("\n"); let m = message_lines.join("\n");
let index = m.indexOf("\x1b"); let index = m.indexOf("\x1b");
@ -249,22 +258,6 @@ export class LoggingBase {
} }
return { stream: fs.createWriteStream(file, { flags: "a" }), size: size }; return { stream: fs.createWriteStream(file, { flags: "a" }), size: size };
// if (await fsExists(this.logFileLocation + "error.log")) {
// let stats = await fsStat(this.logFileLocation + "error.log")
// if (stats.size > maxFileSize) {
// if (await fsExists(this.logFileLocation + "error.log.old"))
// await fsUnlink(this.logFileLocation + "error.log.old");
// await fsMove(this.logFileLocation + "error.log", this.logFileLocation + "error.log.old")
// } else {
// this.errorSize = stats.size;
// }
// }
// this.fileStream = fs.createWriteStream(this.logFileLocation + "all.log", { flags: "a" });
// this.errorStream = fs.createWriteStream(this.logFileLocation + "error.log", { flags: "a" });
// this.writing = false;
// this.checkQueue();
} catch (e) { } catch (e) {
console.log(e); console.log(e);
} }