Compare commits

...

4 Commits

Author SHA1 Message Date
3575262001 2.0.29 2020-06-11 10:11:38 +00:00
1cc75afc32 fix(core): update 2020-06-11 10:11:37 +00:00
7d72b24770 2.0.28 2020-06-08 20:45:02 +00:00
ffff60772c fix(core): update 2020-06-08 20:45:02 +00:00
7 changed files with 33 additions and 21 deletions

14
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@pushrocks/smartlog",
"version": "2.0.27",
"version": "2.0.29",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -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",

View File

@ -1,6 +1,6 @@
{
"name": "@pushrocks/smartlog",
"version": "2.0.27",
"version": "2.0.29",
"private": false,
"description": "minimalistic distributed and extensible logging tool",
"keywords": [
@ -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/**/*",

View File

@ -76,7 +76,6 @@ The following destinations are available:
// TBD
```
## Contribution
We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)

View File

@ -7,7 +7,7 @@ let testSmartLog: smartlog.Smartlog;
tap.test('should produce a valid ConsoleLog instance', async () => {
testConsoleLog = new smartlog.ConsoleLog();
testConsoleLog.log('ok', 'this is ok');
})
});
tap.test('should produce instance of Smartlog', async () => {
testSmartLog = new smartlog.Smartlog({
@ -38,6 +38,6 @@ tap.test('should be able to log things', async () => {
tap.test('should create a log group', async () => {
const logGroup = testSmartLog.createLogGroup('some cool transaction');
logGroup.log('info', 'this is logged from a log group');
})
});
tap.start();

View File

@ -5,13 +5,17 @@ export class LogGroup {
public smartlogRef: Smartlog;
public transactionId: string;
public groupId = plugins.isounique.uni();
constructor(smartlogInstance: Smartlog, transactionIdArg: string) {
this.smartlogRef = smartlogInstance;
this.transactionId = transactionIdArg;
}
public log(logLevelArg: plugins.smartlogInterfaces.TLogLevel, logMessageArg: string, logDataArg?: any) {
public log(
logLevelArg: plugins.smartlogInterfaces.TLogLevel,
logMessageArg: string,
logDataArg?: any
) {
this.smartlogRef.log(logLevelArg, logMessageArg, logDataArg, {
id: plugins.isounique.uni(),
type: 'none',
@ -20,5 +24,4 @@ export class LogGroup {
transaction: this.transactionId
});
}
}
}

View File

@ -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);
}
}
}

View File

@ -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(