From 80ea5d715c6a5c543294c4809c9ebd457ff7e45c Mon Sep 17 00:00:00 2001
From: Shweta Jain <sjain@loggly.com>
Date: Wed, 27 Jun 2018 14:48:32 +0530
Subject: [PATCH] Add new flag for network errors

---
 lib/loggly/client.js |  2 ++
 lib/loggly/common.js | 18 ++++++++++--------
 package.json         |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/lib/loggly/client.js b/lib/loggly/client.js
index 0f3fef4..492018e 100644
--- a/lib/loggly/client.js
+++ b/lib/loggly/client.js
@@ -77,6 +77,7 @@ var Loggly = exports.Loggly = function (options) {
   this.useTagHeader = 'useTagHeader' in options ? options.useTagHeader : true;
   this.isBulk       = options.isBulk || false;
   this.bufferOptions = options.bufferOptions || {size: 500, retriesInMilliSeconds: 30 * 1000};
+  this.networkErrorsOnConsole = options.networkErrorsOnConsole || false;
   //
   // Set the tags on this instance.
   //
@@ -153,6 +154,7 @@ Loggly.prototype.log = function (msg, tags, callback) {
     proxy:   this.proxy,
     isBulk: this.isBulk,
     bufferOptions: this.bufferOptions,
+    networkErrorsOnConsole: this.networkErrorsOnConsole,
     headers: {
       host:             this.host,
       accept:           '*/*',
diff --git a/lib/loggly/common.js b/lib/loggly/common.js
index c01114d..ef1dbe5 100644
--- a/lib/loggly/common.js
+++ b/lib/loggly/common.js
@@ -90,7 +90,8 @@ common.loggly = function () {
       proxy,
       isBulk,
       uri,
-      bufferOptions;
+      bufferOptions,
+      networkErrorsOnConsole;
 
   //
   // Now that we've popped off the two callbacks
@@ -113,6 +114,7 @@ common.loggly = function () {
       headers     = args[0].headers;
       proxy       = args[0].proxy;
       bufferOptions = args[0].bufferOptions;
+      networkErrorsOnConsole = args[0].networkErrorsOnConsole;
     }
   }
   else if (args.length === 2) {
@@ -201,7 +203,7 @@ common.loggly = function () {
               return onError((new Error('Loggly Error (' + responseCode + '): ' + httpStatusCode.badToken.message)));
             }
             if (responseCode === httpStatusCode.success.code && input.attemptNumber >= eventRetried) {
-              console.log('log #' + input.id + ' sent successfully after ' + input.attemptNumber + ' retries');
+              if (networkErrorsOnConsole) console.log('log #' + input.id + ' sent successfully after ' + input.attemptNumber + ' retries');
             }
             if (responseCode === httpStatusCode.success.code) {
               success(res, body);
@@ -239,7 +241,7 @@ common.loggly = function () {
               return onError((new Error('Loggly Error (' + responseCode + '): ' + httpStatusCode.badToken.message)));
             }
             if (responseCode === httpStatusCode.success.code && bulk.attemptNumber >= eventRetried) {
-              console.log('log #' + bulk.id + ' sent successfully after ' + bulk.attemptNumber + ' retries');
+              if (networkErrorsOnConsole) console.log('log #' + bulk.id + ' sent successfully after ' + bulk.attemptNumber + ' retries');
             }
             if (responseCode === httpStatusCode.success.code) {
               success(res, body);
@@ -285,22 +287,22 @@ common.loggly = function () {
   //
   function retryOnError(mode, response) {
     function tryAgainIn(sleepTimeMs) {
-      console.log('log #' + mode.id + ' - Trying again in ' + sleepTimeMs + '[ms], attempt no. ' + mode.attemptNumber);
+      if (networkErrorsOnConsole) console.log('log #' + mode.id + ' - Trying again in ' + sleepTimeMs + '[ms], attempt no. ' + mode.attemptNumber);
       setTimeout(function () {
         isBulk ? sendBulkLogs(mode) : sendInputLogs(mode);
       }, sleepTimeMs);
     }
     if (mode.attemptNumber >= numberOfRetries) {
       if (response.code) {
-        console.error('Failed log #' + mode.id + ' after ' + mode.attemptNumber + ' retries on error = ' + response, response);
+        if (networkErrorsOnConsole) console.error('Failed log #' + mode.id + ' after ' + mode.attemptNumber + ' retries on error = ' + response, response);
       } else {
-        console.error('Failed log #' + mode.id + ' after ' + mode.attemptNumber + ' retries on error = ' + response.statusCode + ' ' + response.statusMessage);
+        if (networkErrorsOnConsole) console.error('Failed log #' + mode.id + ' after ' + mode.attemptNumber + ' retries on error = ' + response.statusCode + ' ' + response.statusMessage);
       }
     } else {
         if (response.code) {
-          console.log('log #' + mode.id + ' - failed on error: ' + response);
+          if (networkErrorsOnConsole) console.log('log #' + mode.id + ' - failed on error: ' + response);
         } else {  
-          console.log('log #' + mode.id + ' - failed on error: ' + response.statusCode + ' ' + response.statusMessage);
+          if (networkErrorsOnConsole) console.log('log #' + mode.id + ' - failed on error: ' + response.statusCode + ' ' + response.statusMessage);
         }
         sleepTimeMs = mode.sleepUntilNextRetry;
         mode.sleepUntilNextRetry = mode.sleepUntilNextRetry * 2;
diff --git a/package.json b/package.json
index 68ab3c4..6d0eaa5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "node-loggly-bulk",
   "description": "A client implementation for Loggly cloud Logging-as-a-Service API",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "author": "Charlie Robbins <charlie.robbins@gmail.com>",
   "repository": {
     "type": "git",