fix(core): update

This commit is contained in:
Philipp Kunz 2019-01-16 00:01:19 +01:00
parent ac4d466ab4
commit fa074facbb
4 changed files with 759 additions and 252 deletions

View File

@ -34,21 +34,34 @@ snyk:
- docker - docker
- notpriv - notpriv
sast:
stage: security
image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
variables:
DOCKER_DRIVER: overlay2
allow_failure: true
services:
- docker:stable-dind
script:
- npmci npm prepare
- npmci npm install
- npmci command npm run build
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
- docker run
--env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
--volume "$PWD:/code"
--volume /var/run/docker.sock:/var/run/docker.sock
"registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
artifacts:
reports:
sast: gl-sast-report.json
tags:
- docker
- priv
# ==================== # ====================
# test stage # test stage
# ==================== # ====================
testLEGACY:
stage: test
script:
- npmci npm prepare
- npmci node install legacy
- npmci npm install
- npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- docker
- notpriv
allow_failure: true
testLTS: testLTS:
stage: test stage: test
@ -135,13 +148,3 @@ pages:
paths: paths:
- public - public
allow_failure: true allow_failure: true
windowsCompatibility:
image: stefanscherer/node-windows:10-build-tools
stage: metadata
script:
- npm install & npm test
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- windows
allow_failure: true

931
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -13,15 +13,15 @@
"format": "(gitzone format)" "format": "(gitzone format)"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.0.22", "@gitzone/tsbuild": "^2.1.4",
"@gitzone/tsrun": "^1.1.13", "@gitzone/tsrun": "^1.1.17",
"@gitzone/tstest": "^1.0.15", "@gitzone/tstest": "^1.0.18",
"@pushrocks/tapbundle": "^3.0.7", "@pushrocks/tapbundle": "^3.0.7",
"@types/node": "^10.12.2", "@types/node": "^10.12.18",
"tslint": "^5.11.0", "tslint": "^5.12.1",
"tslint-config-prettier": "^1.15.0" "tslint-config-prettier": "^1.17.0"
}, },
"dependencies": { "dependencies": {
"@pushrocks/smartlog-interfaces": "^2.0.2" "@pushrocks/smartlog-interfaces": "^2.0.5"
} }
} }

View File

@ -1,7 +1,15 @@
import * as plugins from './smartlog.plugins'; import * as plugins from './smartlog.plugins';
// interfaces // interfaces
import { TLogType, TEnvironment, ILogContext, TLogLevel, TRuntime, ILogDestination, ILogPackage } from '@pushrocks/smartlog-interfaces'; import {
TLogType,
TEnvironment,
ILogContext,
TLogLevel,
TRuntime,
ILogDestination,
ILogPackage
} from '@pushrocks/smartlog-interfaces';
import { LogRouter } from './smartlog.classes.logrouter'; import { LogRouter } from './smartlog.classes.logrouter';
@ -18,7 +26,7 @@ export class Smartlog {
private logRouter = new LogRouter(); private logRouter = new LogRouter();
public addLogDestination (logDestinationArg: ILogDestination) { public addLogDestination(logDestinationArg: ILogDestination) {
this.logRouter.addLogDestination(logDestinationArg); this.logRouter.addLogDestination(logDestinationArg);
} }
@ -27,7 +35,6 @@ export class Smartlog {
this.minimumLogLevel = optionsArg.minimumLogLevel; this.minimumLogLevel = optionsArg.minimumLogLevel;
} }
// ============ // ============
// Logger Setup // Logger Setup
// ============ // ============
@ -59,7 +66,7 @@ export class Smartlog {
level: logLevelArg, level: logLevelArg,
message: logMessageArg message: logMessageArg
}; };
if(logDataArg) { if (logDataArg) {
logPackage.data = logDataArg; logPackage.data = logDataArg;
} }
this.logRouter.routeLog(logPackage); this.logRouter.routeLog(logPackage);