Compare commits

..

17 Commits

Author SHA1 Message Date
484e5d51cc 1.0.16 2018-11-04 18:44:28 +01:00
a8bac181a4 fix(core): update 2018-11-04 18:44:28 +01:00
76d3926ba4 1.0.15 2018-11-04 15:49:03 +01:00
0310c03ecb 1.0.14 2018-11-04 15:37:55 +01:00
9e8efc7dea fix(core): update 2018-11-04 15:37:55 +01:00
00e1b8d862 1.0.13 2018-11-04 15:25:27 +01:00
c5cedb027d fix(core): update 2018-11-04 15:25:27 +01:00
f075f7f23a 1.0.12 2018-11-04 14:56:25 +01:00
809df76043 fix(core): update 2018-11-04 14:56:25 +01:00
d1dde293f6 1.0.11 2018-11-04 14:24:13 +01:00
b7ee6bb9a6 fix(smartlog): add getSmartlogDestination() 2018-11-04 14:24:12 +01:00
15cfa8fe88 1.0.10 2018-11-04 02:41:46 +01:00
1e222c7ad8 fix(core): update 2018-11-04 02:41:45 +01:00
91a1571635 1.0.9 2018-11-04 00:05:36 +01:00
2e39906fd2 fix(core): update 2018-11-04 00:05:36 +01:00
7950cb1649 1.0.8 2018-11-03 23:32:31 +01:00
b085dc32db fix(core): update 2018-11-03 23:32:31 +01:00
6 changed files with 47 additions and 20 deletions

4
.snyk Normal file
View File

@ -0,0 +1,4 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.12.0
ignore: {}
patch: {}

8
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@mojoio/logdna", "name": "@mojoio/logdna",
"version": "1.0.7", "version": "1.0.16",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -137,9 +137,9 @@
} }
}, },
"@pushrocks/smartlog-interfaces": { "@pushrocks/smartlog-interfaces": {
"version": "2.0.0", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/@pushrocks/smartlog-interfaces/-/smartlog-interfaces-2.0.0.tgz", "resolved": "https://registry.npmjs.org/@pushrocks/smartlog-interfaces/-/smartlog-interfaces-2.0.2.tgz",
"integrity": "sha512-rk3uEp78AXLULS81SUe6YtZvyQiDImuJu/zxnIzzUFDB6ciisqtJ1qVcHYbVsW/kImeo8vBFlQyKY9/YaNgkDw==" "integrity": "sha512-kJNQ/6kfljgtwebhoiD8WtRWfdVhOoE1nr8FoUJLlOjLphU8SPa42Hg6/yPkSTaGxWwDhk6PkMJl64O7HNjRUQ=="
}, },
"@pushrocks/smartpath": { "@pushrocks/smartpath": {
"version": "4.0.1", "version": "4.0.1",

View File

@ -1,6 +1,6 @@
{ {
"name": "@mojoio/logdna", "name": "@mojoio/logdna",
"version": "1.0.7", "version": "1.0.16",
"private": false, "private": false,
"description": "anunoffical package for the logdna api", "description": "anunoffical package for the logdna api",
"main": "dist/index.js", "main": "dist/index.js",
@ -22,7 +22,7 @@
"tslint-config-prettier": "^1.15.0" "tslint-config-prettier": "^1.15.0"
}, },
"dependencies": { "dependencies": {
"@pushrocks/smartlog-interfaces": "^2.0.0", "@pushrocks/smartlog-interfaces": "^2.0.2",
"@pushrocks/smartrequest": "^1.1.14", "@pushrocks/smartrequest": "^1.1.14",
"@pushrocks/smartstring": "^3.0.4", "@pushrocks/smartstring": "^3.0.4",
"@pushrocks/taskbuffer": "^2.0.5" "@pushrocks/taskbuffer": "^2.0.5"

View File

@ -14,7 +14,8 @@ tap.test('should create a valid logDna account', async () => {
tap.test('should create a standard log message', async () => { tap.test('should create a standard log message', async () => {
testLogMessage = logdna.LogdnaMessage.fromSmartLogPackage({ testLogMessage = logdna.LogdnaMessage.fromSmartLogPackage({
type: 'log', timestamp: Date.now(),
type: 'log',
level: 'info', level: 'info',
context: { context: {
company: 'Lossless GmbH', company: 'Lossless GmbH',
@ -22,9 +23,9 @@ tap.test('should create a standard log message', async () => {
containerName: 'ci-mojoio-logdna', containerName: 'ci-mojoio-logdna',
environment: 'test', environment: 'test',
runtime: 'node', runtime: 'node',
zone: 'ship.zone' zone: 'shipzone'
}, },
message: 'this is a awesome log message :)' message: 'this is an awesome log message sent by the tapbundle test'
}); });
}); });

View File

@ -6,6 +6,11 @@ import { TLogLevel, TEnvironment, ILogPackage } from '@pushrocks/smartlog-interf
* the constructor options for LogdnaMessage * the constructor options for LogdnaMessage
*/ */
export interface ILogdnaMessageContructorOptions { export interface ILogdnaMessageContructorOptions {
/**
* a timestamp for then the log message was created
*/
timestamp: number;
/** /**
* the hostname where the log message was created * the hostname where the log message was created
*/ */
@ -62,12 +67,16 @@ export class LogdnaMessage {
*/ */
static fromSmartLogPackage(smartlogPackageArg: ILogPackage): LogdnaMessage { static fromSmartLogPackage(smartlogPackageArg: ILogPackage): LogdnaMessage {
return new LogdnaMessage({ return new LogdnaMessage({
timestamp: smartlogPackageArg.timestamp,
line: smartlogPackageArg.message, line: smartlogPackageArg.message,
meta: smartlogPackageArg.context, meta: {
...smartlogPackageArg.context,
logType: smartlogPackageArg.type
},
env: smartlogPackageArg.context.environment, env: smartlogPackageArg.context.environment,
hostname: smartlogPackageArg.context.zone, hostname: smartlogPackageArg.context.zone,
level: smartlogPackageArg.level, level: smartlogPackageArg.level,
app: smartlogPackageArg.context.zone, app: smartlogPackageArg.context.containerName,
tags: (() => { tags: (() => {
const tagArray: string[] = []; const tagArray: string[] = [];
tagArray.push(smartlogPackageArg.context.company); tagArray.push(smartlogPackageArg.context.company);

View File

@ -1,7 +1,7 @@
import * as plugins from './logdna.plugins'; import * as plugins from './logdna.plugins';
import { LogdnaMessage } from './logdna.classes.logmessage'; import { LogdnaMessage } from './logdna.classes.logmessage';
import { ILogPackage } from '@pushrocks/smartlog-interfaces'; import { ILogPackage, ILogDestination } from '@pushrocks/smartlog-interfaces';
/** /**
* the main logdna account * the main logdna account
@ -37,21 +37,23 @@ export class LogdnaAccount {
// let construct the request uri // let construct the request uri
const requestUrlWithParams = `${this.baseUrl}?hostname=${euc(lm.options.hostname)}&mac=${euc( const requestUrlWithParams = `${this.baseUrl}?hostname=${euc(lm.options.hostname)}&mac=${euc(
lm.options.mac lm.options.mac
)}&ip=1${euc(lm.options.ip)}&now=${Date.now()}`; )}&ip=1${euc(lm.options.ip)}&now=${Date.now()}&tags=${euc(
(() => {
return lm.options.tags.reduce((reduced, newItem) => {
return `${reduced},${newItem}`;
});
})()
)}`;
const requestBodyObject = { const requestBodyObject = {
lines: [ lines: [
{ {
timestamp: lm.options.timestamp,
line: lm.options.line, line: lm.options.line,
app: lm.options.app, app: lm.options.app,
level: lm.options.level, level: lm.options.level,
env: lm.options.env, env: lm.options.env,
meta: lm.options.meta, meta: lm.options.meta
tags: (() => {
return lm.options.tags.reduce((reduced, newItem) => {
return `${reduced},${newItem}`;
});
})()
} }
] ]
}; };
@ -71,7 +73,18 @@ export class LogdnaAccount {
/** /**
* convenience function for smartlog * convenience function for smartlog
*/ */
async sendSmartlogPackage (smartlogPackageArg: ILogPackage) { public async sendSmartlogPackage(smartlogPackageArg: ILogPackage) {
this.sendLogDnaMessage(LogdnaMessage.fromSmartLogPackage(smartlogPackageArg)); this.sendLogDnaMessage(LogdnaMessage.fromSmartLogPackage(smartlogPackageArg));
} }
/**
* returns a smartlog compatible log destination
*/
public get smartlogDestination(): ILogDestination {
return {
handleLog: logPackageArg => {
this.sendSmartlogPackage(logPackageArg);
}
};
}
} }