2.0.11

.gitlab-ci.yml

@@ -34,21 +34,34 @@ snyk:
   - docker
   - 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
 # ====================
-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:
   stage: test
@@ -135,13 +148,3 @@ pages:
     paths:
     - public
   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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartlog",
-  "version": "2.0.3",
+  "version": "2.0.11",
   "private": false,
   "description": "winston based logger for large scale projects",
   "main": "dist/index.js",
@@ -13,15 +13,15 @@
     "format": "(gitzone format)"
   },
   "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",
-    "@types/node": "^10.12.1",
+    "@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": {
-    "@pushrocks/smartlog-interfaces": "^1.0.9"
+    "@pushrocks/smartlog-interfaces": "^2.0.5"
   }
 }

ts/index.ts

@@ -11,4 +11,6 @@ const defaultLogger: Smartlog = new Smartlog({
   }
 });
 
+defaultLogger.enableConsole();
+
 export { Smartlog, defaultLogger };

ts/smartlog.classes.smartlog.ts

@@ -1,7 +1,15 @@
 import * as plugins from './smartlog.plugins';
 
 // interfaces
-import { TEnvironment, ILogContext, TLogLevel, TRuntime } from '@pushrocks/smartlog-interfaces';
+import {
+  TLogType,
+  TEnvironment,
+  ILogContext,
+  TLogLevel,
+  TRuntime,
+  ILogDestination,
+  ILogPackage
+} from '@pushrocks/smartlog-interfaces';
 
 import { LogRouter } from './smartlog.classes.logrouter';
 
@@ -13,19 +21,20 @@ export interface ISmartlogContructorOptions {
 export class Smartlog {
   private logContext: ILogContext;
   private minimumLogLevel: TLogLevel;
-  
-  private consoleEnabled: boolean;
-  
-  public logRouter = new LogRouter();
 
-  public addLogDestination = this.logRouter.addLogDestination;
+  private consoleEnabled: boolean;
+
+  private logRouter = new LogRouter();
+
+  public addLogDestination(logDestinationArg: ILogDestination) {
+    this.logRouter.addLogDestination(logDestinationArg);
+  }
 
   constructor(optionsArg: ISmartlogContructorOptions) {
     this.logContext = optionsArg.logContext;
     this.minimumLogLevel = optionsArg.minimumLogLevel;
   }
 
-
   // ============
   // Logger Setup
   // ============
@@ -37,48 +46,46 @@ export class Smartlog {
     this.consoleEnabled = true;
   }
 
-  /**
-   * set a minimum serverity level to log
-   * @param levelArg
-   */
-  level(levelArg: TLogLevel) {}
-
   // =============
   // log functions
   // =============
   /**
-   * log stuff
+   * main log method
-   * @param logLevelArg
+   * @param logLevelArg - the log level
-   * @param logMessageArg
+   * @param logMessageArg - the log message
+   * @param logDataArg - any additional log data
    */
-  public log(logLevelArg: TLogLevel, logMessageArg: string) {
+  public log(logLevelArg: TLogLevel, logMessageArg: string, logDataArg?: any) {
     if (this.consoleEnabled) {
-      console.log(`${logLevelArg}: ${logMessageArg}`);
+      console.log(`LOG: ${logLevelArg}: ${logMessageArg}`);
+    }
+    const logPackage: ILogPackage = {
+      timestamp: Date.now(),
+      type: 'log',
+      context: this.logContext,
+      level: logLevelArg,
+      message: logMessageArg
+    };
+    if (logDataArg) {
+      logPackage.data = logDataArg;
+    }
+    this.logRouter.routeLog(logPackage);
+  }
+
+  public increment(logLevelArg: TLogLevel, logMessageArg) {
+    if (this.consoleEnabled) {
+      console.log(`INCREMENT: ${logLevelArg}: ${logMessageArg}`);
     }
     this.logRouter.routeLog({
-      logContext: this.logContext,
+      timestamp: Date.now(),
-      logLevel: logLevelArg,
+      type: 'increment',
+      context: this.logContext,
+      level: logLevelArg,
       message: logMessageArg
     });
   }
 
-  public silly(logMessageArg: string) {
+  public handleLogPackage(logPackageArg: ILogPackage) {
-    this.log('silly', logMessageArg);
+    this.logRouter.routeLog(logPackageArg);
-  }
-
-  public debug(logMessageArg) {
-    this.log('debug', logMessageArg);
-  }
-
-  public info(logMessageArg: string) {
-    this.log('info', logMessageArg);
-  }
-
-  public warn(logMessageArg) {
-    this.log('warn', logMessageArg);
-  }
-
-  public error(logMessageArg) {
-    this.log('error', logMessageArg);
   }
 }