Bunyan and Loggly updates

package.json

@@ -28,9 +28,8 @@
     "bcrypt": "^1.0.2",
     "bootstrap": "^3.3.7",
     "braintree": "^2.0.2",
-    "bunyan": "^1.8.9",
+    "bunyan": "^2.0.0",
     "bunyan-format": "^0.2.1",
-    "bunyan-loggly": "^1.2.0",
     "classnames": "^2.2.5",
     "copy-to-clipboard": "^3.0.6",
     "country-data": "^0.0.31",
@@ -59,6 +58,7 @@
     "moment-timezone": "^0.5.11",
     "nexmo": "^1.2.0",
     "node-geocoder": "^3.16.0",
+    "node-loggly-bulk": "^2.0.0",
     "nodemailer-wellknown": "^0.2.1",
     "nouislider-algolia-fork": "^10.0.0",
     "npm-shrinkwrap": "^6.0.2",

server/api/core/import.js

@@ -2,7 +2,7 @@ import { Mongo } from "meteor/mongo";
 import { EJSON } from "meteor/ejson";
 import * as Collections from "/lib/collections";
 import Hooks from "../hooks";
-import Logger from "../logger";
+import { Logger } from "../logger";
 import doRightJoinNoIntersection from "./rightJoin";
 
 /**

server/api/index.js

@@ -3,7 +3,7 @@ import * as Accounts from "./core/accounts";
 import Router from "./router";
 import GeoCoder from "./geocoder";
 import Hooks from "./hooks";
-import Logger from "./logger";
+import { Logger } from "./logger";
 import { MethodHooks } from "./method-hooks";
 
 export {

server/api/logger/index.js

@@ -0,0 +1 @@
+export { default as Logger } from "./main";

server/api/logger/loggly.js

@@ -0,0 +1,67 @@
+import loggly from "node-loggly-bulk";
+
+class Bunyan2Loggly {
+  constructor(logglyConfig, bufferLength = 1, bufferTimeout, callback) {
+    if (!logglyConfig || !logglyConfig.token || !logglyConfig.subdomain) {
+      throw new Error("bunyan-loggly requires a config object with token and subdomain");
+    }
+
+    logglyConfig.json = true;
+
+    this.logglyClient = loggly.createClient(logglyConfig);
+
+    this._buffer = [];
+    this.bufferLength = bufferLength;
+    this.bufferTimeout = bufferTimeout;
+    this.callback = callback || function () {};
+  }
+
+  write(data) {
+    if (typeof data !== "object") {
+      throw new Error("bunyan-loggly requires a raw stream. Please define the type as raw when setting up the bunyan stream.");
+    }
+
+    // loggly prefers timestamp over time
+    if (data.time) {
+      data.timestamp = data.time;
+      delete data.time;
+    }
+
+    this._buffer.push(data);
+
+    this._checkBuffer();
+  }
+
+  _processBuffer() {
+    clearTimeout(this._timeoutId);
+
+    let content = this._buffer.slice();
+
+    this._buffer = [];
+
+    if (content.length === 1) {
+      content = content[0];
+    }
+
+    this.logglyClient.log(content, (error, result) => {
+      this.callback(error, result, content);
+    });
+  }
+
+  _checkBuffer() {
+    if (!this._buffer.length) {
+      return;
+    }
+
+    if (this._buffer.length >= this.bufferLength) {
+      return this._processBuffer();
+    }
+
+    if (this.bufferTimeout) {
+      clearTimeout(this._timeoutId);
+      this._timeoutId = setTimeout(() => { this._processBuffer(); }, this.bufferTimeout);
+    }
+  }
+}
+
+export default Bunyan2Loggly;

server/api/logger.js → server/api/logger/main.js

@@ -1,26 +1,27 @@
+import _ from "lodash";
 import bunyan from "bunyan";
 import bunyanFormat from "bunyan-format";
-import Bunyan2Loggly from "bunyan-loggly";
-import { includes } from "lodash";
+import { Meteor } from "meteor/meteor";
+import Bunyan2Loggly from "./loggly";
 
 // configure bunyan logging module for reaction server
 // See: https://github.com/trentm/node-bunyan#levels
 const levels = ["FATAL", "ERROR", "WARN", "INFO", "DEBUG", "TRACE"];
 
 // set stdout log level
 let level = process.env.REACTION_LOG_LEVEL || Meteor.settings.REACTION_LOG_LEVEL || "INFO";
-let outputMode = "short";
+
+// allow overriding the stdout log formatting
+// available options: short|long|simple|json|bunyan
+// https://www.npmjs.com/package/bunyan-format
+const outputMode = process.env.REACTION_LOG_FORMAT || "short";
 
 level = level.toUpperCase();
 
-if (!includes(levels, level)) {
+if (!_.includes(levels, level)) {
   level = "INFO";
 }
 
-if (level === "TRACE") {
-  outputMode = "json";
-}
-
 // default console config (stdout)
 const streams = [{
   level,
@@ -38,7 +39,7 @@ if (logglyToken && logglySubdomain) {
     stream: new Bunyan2Loggly({
       token: logglyToken,
       subdomain: logglySubdomain
-    })
+    }, process.env.LOGGLY_BUFFER_LENGTH || 1)
   };
   streams.push(logglyStream);
 }