@sera4/essentia 1.0.13 → 1.0.16

package/health/index.js

@@ -1,8 +1,6 @@
 "use strict"
 
 const pathHelper = require("path");
-const logger = require("../logger/s4-logger");
-const lc = require("../last_commit");
 
 class HealthCheckError extends Error {
   constructor(m) {
@@ -11,7 +9,7 @@ class HealthCheckError extends Error {
 }
 
 /* Health Checking router + controller for use in all of our modules
- * Example use: Place the following code in your routes file 
+ * Example use: Place the following code in your routes file
  *
  *    const hc = require("@sera4/essentia").healthCheck;
  *    const router = require('express').Router();
@@ -22,7 +20,7 @@ class HealthCheckError extends Error {
  */
 
 class HealthCheck {
-  constructor(appendData = {}) { 
+  constructor(appendData = {}) {
     this.defaultResponse = {
       ...
       appendData,
@@ -30,25 +28,17 @@ class HealthCheck {
       errors: {}
     };
 
-    this.defaultPathRoute = `health_check\(.*\)?` 
-    this.lastCallID = null;
-    this.lastCommit = "unknown"
-
-    // dev versions don't generate this by default
-    try {
-      this.lastCommit = lc.getLastCommitSync().commit;
-    } catch(e) {
-    }
-
+    this.defaultPathRoute = `health_check\(.*\)?`
+    this.lastCallId = 0; // default start point/integer
     this.healthChecks = [];
   }
 
-  /* call this with an async function, must support wait capability 
-   * 
+  /* call this with an async function, must support wait capability
+   *
    *   const dbCheck = async () => {
    *     return { name: "db", "result": "success", critical: false };
    *   }
-   */ 
+   */
   addCheck(fcn) {
     this.healthChecks.push(fcn);
   }
@@ -79,9 +69,12 @@ class HealthCheck {
         return await healthCallback();
       }));
 
-      //let result = (result.reduce((e) => e.success, 200))
-      let callId = (Math.random()*0xFFFFFF<<0).toString(16);
-      this.lastCallId = callId;
+      let callId = ++this.lastCallId;
+
+      // start the counter over
+      if ((callId % (1 << 30)) === 0) {
+        callId = this.lastCallId = 1;
+      }
 
       let status = this.defaultResponse.status;
 
@@ -94,10 +87,9 @@ class HealthCheck {
 
       // set this in the header no matter what
       res.setHeader('check', callId)
-      res.setHeader('lastCommit', this.lastCommit)
 
       if (checkFormat === ".json") {
-        const payload = { "check": callId, "commit": this.lastCommit }
+        const payload = { "check": callId }
 
         if (status === 200) {
           res.status(status).json({
@@ -125,7 +117,7 @@ class HealthCheck {
       }
     } catch(error) {
       res.status(500).send();
-    }  
+    }
   }
 }
 

package/logger/s4-logger.js

@@ -1,38 +1,99 @@
 const winston = require('winston');
-const logger = new winston.Logger();
-const loggerName = "console.debug";
-
-logger.add(winston.transports.Console, {
-  name: loggerName,
-  colorize: true,
-  showLevel: true,
-  level: 'debug'
+const jsonStringify = require('fast-safe-stringify');
+const colorizer = winston.format.colorize();
+
+require('winston-logstash');
+
+const devFormat = {
+  transform(info) {
+    const { message } = info;
+    const level = info[Symbol.for('level')];
+    const args = info[Symbol.for('splat')];
+    const strArgs = args.map(jsonStringify).join(' ');
+    info[Symbol.for('message')] = colorizer.colorize(level, `${level}: ${message} ${strArgs}`);
+    return info;
+  }
+};
+
+const defaultTransport = new winston.transports.Console({
+  format: devFormat
+});
+
+const logger = winston.createLogger({
+  level: 'debug',
+  defaultMeta: { },
+  transports: [defaultTransport]
 });
 
 class S4Logger {
+  configure(options) {
+    if (!options) {
+      return;
+    }
+
+    if (options.level && ["debug", "info", "error", "warn"].indexOf(options.level.toLowerCase())) {
+      logger.level = options.level;
+    }
+
+    logger.defaultMeta.service = options.service;
+    switch(options.format.toLowerCase()) {
+      case "logstash":
+          defaultTransport.format = winston.format.logstash();
+          break;
+      case "json":
+        defaultTransport.format = winston.format.json();
+        break;
+      default:
+        defaultTransport.format = devFormat;
+        break;
+    }
+  }
+
   setLevel(level) {
     if (level && ["debug", "info", "error", "warn"].indexOf(level.toLowerCase())) {
-      logger.transports[loggerName].level = level;  
+      logger.level = level;
     }
   }
+
   mute() {
-    logger.transports[loggerName].silent = true;
+    logger.transports.forEach(t => {
+      t.silent = true;
+    });
   }
+
   unmute() {
-    logger.transports[loggerName].silent = false;
+    logger.transports.forEach(t => {
+      t.silent = false;
+    });
   }
+
   debug(str, args) {
     logger.log("debug", str, args);
   }
+
+  log(str, args) {
+    logger.log("debug", str, args);
+  }
+
   warn(str, args) {
     logger.log("warn", str, args);
   }
+
   info(str, args) {
     logger.log("info", str, args);
   }
+
   error(str, args) {
     logger.log("error", str, args);
   }
+
+  getStream() {
+    return {
+      write: function(message, encoding){
+        logger.info(message);
+      }
+    }
+  }
 }
 
 module.exports = new S4Logger();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sera4/essentia",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "description": "A library of utilities for Teleporte Web Services",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,9 @@
   },
   "dependencies": {
     "async": "^2.6.1",
+    "fast-safe-stringify": "^2.0.6",
     "git-rev": "^0.2.1",
-    "winston": "^2.4.2"
+    "winston": "^3.2.1",
+    "winston-logstash": "^0.4.0"
   }
 }