From 1cc75afc3231281311e44331d26a23a0c27c4978 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Thu, 11 Jun 2020 10:11:37 +0000 Subject: [PATCH] fix(core): update --- package-lock.json | 12 ++++++------ package.json | 4 ++-- ts/smartlog.classes.logrouter.ts | 4 ++-- ts/smartlog.classes.smartlog.ts | 14 ++++++++++++-- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index dfc31cc..2d4f4b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1188,9 +1188,9 @@ } }, "@pushrocks/smartlog-interfaces": { - "version": "2.0.18", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartlog-interfaces/-/smartlog-interfaces-2.0.18.tgz", - "integrity": "sha512-2CUGyTJsf4/pTqJqu7FUCsB/I5Vsz+DwpwPG/2sQk5VxT9oX8AUWtz2BspLrGNlMg7wTJR79f4yA6Dk5xQ6qFQ==", + "version": "2.0.19", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartlog-interfaces/-/smartlog-interfaces-2.0.19.tgz", + "integrity": "sha512-H4iQm1ZRSxnBTUy58WQ3VY0kFLHTm0eXrZX0+UPptgBQoZ8DZZow+bbY7yo0s4+q1EN0NqpJWVRkOQmZJ0asJg==", "requires": { "@apiglobal/typedrequest-interfaces": "^1.0.13" } @@ -1599,9 +1599,9 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/node": { - "version": "14.0.11", - "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.0.11.tgz", - "integrity": "sha512-lCvvI24L21ZVeIiyIUHZ5Oflv1hhHQ5E1S25IRlKIXaRkVgmXpJMI3wUJkmym2bTbCe+WoIibQnMVAU3FguaOg==" + "version": "14.0.13", + "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.0.13.tgz", + "integrity": "sha512-rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA==" }, "@types/portscanner": { "version": "2.1.0", diff --git a/package.json b/package.json index 02860f3..fa253b9 100644 --- a/package.json +++ b/package.json @@ -25,14 +25,14 @@ "@gitzone/tsrun": "^1.2.12", "@gitzone/tstest": "^1.0.33", "@pushrocks/tapbundle": "^3.2.1", - "@types/node": "^14.0.11", + "@types/node": "^14.0.13", "tslint": "^6.1.2", "tslint-config-prettier": "^1.18.0" }, "dependencies": { "@gitzone/tsbundle": "^1.0.69", "@pushrocks/isounique": "^1.0.4", - "@pushrocks/smartlog-interfaces": "^2.0.18" + "@pushrocks/smartlog-interfaces": "^2.0.19" }, "files": [ "ts/**/*", diff --git a/ts/smartlog.classes.logrouter.ts b/ts/smartlog.classes.logrouter.ts index f9666cb..0d94b14 100644 --- a/ts/smartlog.classes.logrouter.ts +++ b/ts/smartlog.classes.logrouter.ts @@ -15,9 +15,9 @@ export class LogRouter { } // routes the log according to added logDestinations - routeLog(logPackageArg: ILogPackage) { + public async routeLog(logPackageArg: ILogPackage) { for (const logDestination of this.logDestinations) { - logDestination.handleLog(logPackageArg); + await logDestination.handleLog(logPackageArg); } } } diff --git a/ts/smartlog.classes.smartlog.ts b/ts/smartlog.classes.smartlog.ts index a9f0bf6..fc7254f 100644 --- a/ts/smartlog.classes.smartlog.ts +++ b/ts/smartlog.classes.smartlog.ts @@ -50,6 +50,16 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination { write.apply(process.stdout, args); return true; }; + + process.stderr.write = (...args) => { + if (!args[0].startsWith('LOG')) { + this.log('info', args[0]); + return; + } + // fileStream.write(args[0]); + write.apply(process.stderr, args); + return true; + }; } this.consoleEnabled = true; } @@ -64,7 +74,7 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination { * @param logDataArg - any additional log data * @param correlationArg - info about corrleations */ - public log( + public async log( logLevelArg: plugins.smartlogInterfaces.TLogLevel, logMessageArg: string, logDataArg?: any, @@ -94,7 +104,7 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination { if (logDataArg) { logPackage.data = logDataArg; } - this.logRouter.routeLog(logPackage); + await this.logRouter.routeLog(logPackage); } public increment(