fix(core): update

This commit is contained in:
Philipp Kunz 2021-07-07 00:47:45 +02:00
parent 540e5be2fa
commit e451c38f32
4 changed files with 22397 additions and 1017 deletions

23380
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -13,20 +13,20 @@
"format": "(gitzone format)" "format": "(gitzone format)"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.24", "@gitzone/tsbuild": "^2.1.25",
"@gitzone/tstest": "^1.0.33", "@gitzone/tstest": "^1.0.54",
"@pushrocks/qenv": "^4.0.6", "@pushrocks/qenv": "^4.0.10",
"@pushrocks/tapbundle": "^3.2.1", "@pushrocks/tapbundle": "^3.2.14",
"@types/node": "^14.0.11", "@types/node": "^14.0.11",
"tslint": "^6.1.2", "tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0" "tslint-config-prettier": "^1.18.0"
}, },
"dependencies": { "dependencies": {
"@pushrocks/lik": "^4.0.13", "@pushrocks/lik": "^4.0.20",
"@pushrocks/smartlog-interfaces": "^2.0.15", "@pushrocks/smartlog-interfaces": "^2.0.22",
"@pushrocks/smartrequest": "^1.1.47", "@pushrocks/smartrequest": "^1.1.52",
"@pushrocks/smartstring": "^3.0.18", "@pushrocks/smartstring": "^3.0.24",
"@pushrocks/taskbuffer": "^2.1.1" "@pushrocks/taskbuffer": "^2.1.13"
}, },
"files": [ "files": [
"ts/**/*", "ts/**/*",

View File

@ -41,8 +41,9 @@ export class LogAggregator {
private async sendAggregatedLogs(logCandidate: ILogCandidate) { private async sendAggregatedLogs(logCandidate: ILogCandidate) {
this.logObjectMap.remove(logCandidate); this.logObjectMap.remove(logCandidate);
// lets post the message to logdna // lets post the message to logdna
const url = `${this.baseUrl}${logCandidate.urlIdentifier}&now=${Date.now()}`;
const response = await plugins.smartrequest.postJson( const response = await plugins.smartrequest.postJson(
`${this.baseUrl}${logCandidate.urlIdentifier}&now=${Date.now()}`, url,
{ {
headers: { headers: {
Authorization: this.createBasicAuth(), Authorization: this.createBasicAuth(),

View File

@ -31,11 +31,16 @@ export class LogdnaAccount {
const uriIp = euc(lm.options.ip); const uriIp = euc(lm.options.ip);
const uriTags = euc( const uriTags = euc(
(() => { (() => {
let first = true;
return lm.options.tags.reduce((reduced, newItem) => { return lm.options.tags.reduce((reduced, newItem) => {
return `${reduced},${newItem}`; if (first) {
first = false;
reduced = euc(reduced);
}
return `${reduced},euc(${newItem})`;
}); });
})() })()
); )
// let construct the request uri // let construct the request uri
const requestUrlWithParams = `?hostname=${uriHostname}&mac=${uriMac}&ip=1${uriIp}&tags=${uriTags}`; const requestUrlWithParams = `?hostname=${uriHostname}&mac=${uriMac}&ip=1${uriIp}&tags=${uriTags}`;
@ -64,7 +69,7 @@ export class LogdnaAccount {
*/ */
public get smartlogDestination(): ILogDestination { public get smartlogDestination(): ILogDestination {
return { return {
handleLog: logPackageArg => { handleLog: async logPackageArg => {
this.sendSmartlogPackage(logPackageArg); this.sendSmartlogPackage(logPackageArg);
} }
}; };