Make buffer option configurable and truncate events size over 1 MB

lib/loggly/client.js

@@ -23,6 +23,17 @@ function stringify(msg) {
   return payload;
 }
 //
+// function to truncate message over 1 MB
+// 
+function truncateLargeMessage(message) {  
+  var MaximumBytesAllowedToLoggly = 1000 * 1000;
+  var bytesLengthOfLogMessage = Buffer.byteLength(message); 
+  if(bytesLengthOfLogMessage > MaximumBytesAllowedToLoggly) {
+    message = message.slice(0, MaximumBytesAllowedToLoggly);
+  }
+  return message;
+}
+//
 // function createClient (options)
 //   Creates a new instance of a Loggly client.
 //
@@ -56,7 +67,7 @@ var Loggly = exports.Loggly = function (options) {
   this.userAgent    = 'node-loggly ' + loggly.version;
   this.useTagHeader = 'useTagHeader' in options ? options.useTagHeader : true;
   this.isBulk       = options.isBulk || false;
-  this.numberOfLogtobebuffered = options.numberOfLogtobebuffered || 1000;
+  this.bufferOptions = options.bufferOptions || {size: 500, retriesInMilliSeconds: 30 * 1000};
   //
   // Set the tags on this instance.
   //
@@ -91,6 +102,7 @@ util.inherits(Loggly, events.EventEmitter);
 //  - http://www.loggly.com/docs/api-sending-data/
 //
 Loggly.prototype.log = function (msg, tags, callback) {
+  msg.message = truncateLargeMessage(msg.message)
   if (!callback && typeof tags === 'function') {
     callback = tags;
     tags = null;
@@ -120,7 +132,7 @@ Loggly.prototype.log = function (msg, tags, callback) {
     body:    msg,
     proxy:   this.proxy,
     isBulk: this.isBulk,
-    numberOfLogtobebuffered: this.numberOfLogtobebuffered,
+    bufferOptions: this.bufferOptions,
     headers: {
       host:             this.host,
       accept:           '*/*',

lib/loggly/common.js

@@ -89,7 +89,7 @@ common.loggly = function () {
       proxy,
       isBulk,
       uri,
-      numberOfLogtobebuffered;
+      bufferOptions;
 
   //
   // Now that we've popped off the two callbacks
@@ -111,7 +111,7 @@ common.loggly = function () {
       isBulk      = args[0].isBulk;
       headers     = args[0].headers;
       proxy       = args[0].proxy;
-      numberOfLogtobebuffered = args[0].numberOfLogtobebuffered;
+      bufferOptions = args[0].bufferOptions;
     }
   }
   else if (args.length === 2) {
@@ -150,6 +150,8 @@ common.loggly = function () {
     proxy: proxy
   };
 
+  var requestOptionsForBufferedLogs = JSON.parse(JSON.stringify(requestOptions))
+
   if (auth) {
     requestOptions.headers.authorization = 'Basic ' + new Buffer(auth.username + ':' + auth.password).toString('base64');
   }
@@ -167,7 +169,6 @@ common.loggly = function () {
         if (Object.keys(failCodes).indexOf(statusCode) !== -1) {
           return onError((new Error('Loggly Error (' + statusCode + '): ' + failCodes[statusCode])));
         } 
-        sendBufferdLogstoLoggly();
         success(res, body);
       });
     }
@@ -194,7 +195,6 @@ common.loggly = function () {
         if (Object.keys(failCodes).indexOf(statusCode) !== -1) {
           return onError((new Error('Loggly Error (' + statusCode + '): ' + failCodes[statusCode])));
         }
-        sendBufferdLogstoLoggly();
         success(res, body);
       });
     }
@@ -223,34 +223,35 @@ common.loggly = function () {
   if (timerFunctionForBufferedLogs === null) {
     timerFunctionForBufferedLogs = setInterval(function () {
       if (arrBufferedMsg.length) sendBufferdLogstoLoggly();
-    }, 5 * 1000);
+    }, bufferOptions.retriesInMilliSeconds);
   }
 
 
   function sendBufferdLogstoLoggly() {
+    if (!arrBufferedMsg.length) return;
     var arrayMessage = [];
     var bulkModeBunch = arrSize;
     var inputModeBunch = 1;
     var logsInBunch = isBulk ? bulkModeBunch : inputModeBunch;
-    for(var startIndex = 0; startIndex < arrBufferedMsg.length; startIndex = startIndex + logsInBunch) {
-      arrayMessage = arrBufferedMsg.slice(startIndex, startIndex + logsInBunch); 
-      requestOptions.body = isBulk ? arrayMessage.join('\n') : arrayMessage[0];
-      request(requestOptions, function (err, res, body) {
-        if(err) return;
-        var statusCode = res.statusCode.toString();
-        if(statusCode === "200"){
-          arrBufferedMsg.splice(0, logsInBunch);
-        }
-      });
-    }
+    arrayMessage = arrBufferedMsg.slice(0, logsInBunch);
+    requestOptionsForBufferedLogs.body = isBulk ? arrayMessage.join('\n') : arrayMessage[0];
+    request(requestOptionsForBufferedLogs, function (err, res, body) {
+      if(err) return;
+      var statusCode = res.statusCode.toString();
+      if(statusCode === "200") {
+        arrBufferedMsg.splice(0, logsInBunch);
+        sendBufferdLogstoLoggly();
+      }
+    });
+    requestOptionsForBufferedLogs.body = '';
   }
 
 //
 // This function will store logs into buffer
 //
   function storeLogs(logs) {
     if (!logs.length) return;
-    var numberOfLogsToBeRemoved = (arrBufferedMsg.length + logs.length) - numberOfLogtobebuffered;
+    var numberOfLogsToBeRemoved = (arrBufferedMsg.length + logs.length) - bufferOptions.size;
     if (numberOfLogsToBeRemoved > 0) arrBufferedMsg = arrBufferedMsg.splice(numberOfLogsToBeRemoved);
       arrBufferedMsg = arrBufferedMsg.concat(logs);
     }