@sera4/essentia 1.0.15 → 1.0.17

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}:\t`) + `${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.15",
+  "version": "1.0.17",
   "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"
   }
 }