OpenServer/NodeLogging
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding events and fixing call stack in one line problem

Browse Source
This commit is contained in:
Fabian Stamm 2017-09-16 19:12:58 +02:00
parent 836935ac8a
commit 3562efdd6f
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
out/index.d.ts vendored
View File

@ -1,3 +1,5 @@
/// <reference types="node" />
import { EventEmitter } from "events";
export declare class Logging { export declare class Logging {
private static logFileLocation; private static logFileLocation;
private static stdout; private static stdout;
@ -5,6 +7,7 @@ export declare class Logging {
private static errorStream; private static errorStream;
private static writing; private static writing;
private static queue; private static queue;
static events: EventEmitter;
static config(logfolder: string, stdout: boolean): void; static config(logfolder: string, stdout: boolean): void;
static debug(...message: any[]): void; static debug(...message: any[]): void;
static log(...message: any[]): void; static log(...message: any[]): void;

9
out/index.js
View File

@ -2,6 +2,7 @@
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
const util = require("util"); const util = require("util");
const fs = require("fs"); const fs = require("fs");
const events_1 = require("events");
const Reset = "\x1b[0m"; const Reset = "\x1b[0m";
const Bright = "\x1b[1m"; const Bright = "\x1b[1m";
const Dim = "\x1b[2m"; const Dim = "\x1b[2m";
@ -44,7 +45,11 @@ class Logging {
Logging.errorMessage(error); Logging.errorMessage(error);
return; return;
} }
var message = error.name + " " + error.message + "\n" + error.stack; let m = "";
error.stack.forEach(e => {
m += e.toString() + "\n";
});
var message = error.name + " " + error.message + "\n" + m;
Logging.message(LoggingTypes.Error, [message]); Logging.message(LoggingTypes.Error, [message]);
} }
static errorMessage(...message) { static errorMessage(...message) {
@ -89,6 +94,7 @@ class Logging {
} }
Logging.writeMessageToFile(m, type === LoggingTypes.Error); Logging.writeMessageToFile(m, type === LoggingTypes.Error);
} }
Logging.events.emit("message", { type: type, message: mb });
if (this.stdout) if (this.stdout)
console.log(consoleLogFormat + m + Reset); console.log(consoleLogFormat + m + Reset);
} }
@ -155,6 +161,7 @@ Logging.logFileLocation = "./logs/";
Logging.stdout = true; Logging.stdout = true;
Logging.writing = false; Logging.writing = false;
Logging.queue = new Array(); Logging.queue = new Array();
Logging.events = new events_1.EventEmitter();
exports.Logging = Logging; exports.Logging = Logging;
function _getCallerFile() { function _getCallerFile() {
try { try {

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": "logger-perfcloud", "name": "logger-perfcloud",
"version": "1.0.1", "version": "1.0.2",
"description": "", "description": "",
"main": "out/index.js", "main": "out/index.js",
"types": "out/index.d.ts", "types": "out/index.d.ts",

10
src/index.ts
View File

@ -1,5 +1,6 @@
import * as util from "util"; import * as util from "util";
import * as fs from "fs"; import * as fs from "fs";
import { EventEmitter } from "events";
const Reset = "\x1b[0m" const Reset = "\x1b[0m"
const Bright = "\x1b[1m" const Bright = "\x1b[1m"
@ -37,6 +38,8 @@ export class Logging {
private static writing = false; private static writing = false;
private static queue = new Array<{ message: string, error: boolean }>(); private static queue = new Array<{ message: string, error: boolean }>();
static events: EventEmitter = new EventEmitter();
static config(logfolder: string, stdout: boolean) { static config(logfolder: string, stdout: boolean) {
this.logFileLocation = logfolder; this.logFileLocation = logfolder;
this.stdout = stdout; this.stdout = stdout;
@ -59,7 +62,11 @@ export class Logging {
Logging.errorMessage(error); Logging.errorMessage(error);
return; return;
} }
var message = error.name + " " + error.message + "\n" + error.stack; let m = "";
(<any>error.stack).forEach(e => {
m += e.toString() + "\n";
})
var message = error.name + " " + error.message + "\n" + m;
Logging.message(LoggingTypes.Error, [message]); Logging.message(LoggingTypes.Error, [message]);
} }
@ -104,6 +111,7 @@ export class Logging {
} }
Logging.writeMessageToFile(m, type === LoggingTypes.Error); Logging.writeMessageToFile(m, type === LoggingTypes.Error);
} }
Logging.events.emit("message", { type: type, message: mb });
if (this.stdout) console.log(consoleLogFormat + m + Reset); if (this.stdout) console.log(consoleLogFormat + m + Reset);
} }