error governor fix

Author: alexk-blackops

lib/error.js

@@ -4,12 +4,12 @@ var url        = require('url'),
     helpers    = require('./helpers'),
     CONFIG     = require('../config/config'),
 
-    // hash that contains all the errors and their number logged during the current minute
+    // object that contains all the errors and their numbers logged during the current minute
     errorStorage = {};
 
 module.exports = {
     /**
-    * Check for duplicated error messages. If the same error message logged more than configurated limit in one minute
+    * Check for duplicate error messages. If the same error message logged more than configurated limit in one minute
     * don't push it to the queue
     */
     checkErrorLimitMessage : function checkErrorLimitMessage(ex) {
@@ -34,7 +34,7 @@ module.exports = {
             errorStorage[min][key] = 1;
         }
 
-        return errorStorage[min][key] < CONFIG.MSG.MAX_DUP_ERROR_PER_MINUTE;
+        return errorStorage[min][key] <= CONFIG.MSG.MAX_DUP_ERROR_PER_MINUTE;
     },
 
     // getting source method and source method line of code 
@@ -69,7 +69,7 @@ module.exports = {
                 ServerVariables: process.env
             },
             href;
-
+        // add web request details if req object is passed
         if (req) {
             href = url.parse(helpers.getURL(req), true);
             ex.WebRequestDetail = {

lib/logger.js

@@ -5,7 +5,7 @@ var api     = require('./api'),
 
     storage = [],
 
-    // current delay
+    // current delay, starting with one sec
     delay   = CONFIG.DELAY.ONE_SECOND_DELAY,
     sendingLogsInProgress = false,
     // delayed sendLogs call
@@ -48,10 +48,10 @@ var api     = require('./api'),
                     }
                 }
             };
-        // count the delay
+        // re-count the delay
         if (length >= CONFIG.MSG.MAX_BATCH_SIZE) {
             delay = Math.max(Math.round(delay / 2.0), CONFIG.DELAY.ONE_SECOND_DELAY);
-        } else {
+        } else if (length < CONFIG.MSG.MIN_BATCH_SIZE) {
             delay = Math.min(Math.round(1.25 * delay), CONFIG.DELAY.FIVE_SECONDS_DELAY);
         }
 
@@ -86,7 +86,8 @@ module.exports.methods = {
         if (meta.length) {
             if (level.toLowerCase() === 'error') {
                 data = helpers.parseMeta(meta, true);
-                if (data.ex) {
+                // if duplicate errors cap per minute isn't exceeded and error object is passed, create an exception
+                if (data.ex && error.checkErrorLimitMessage(data.ex)) {
                     messageObject.Ex = error.formatEx(data.ex, req);
                 }
             } else {
@@ -98,26 +99,27 @@ module.exports.methods = {
             }
         }
 
-        if (level.toLowerCase() === 'error' && !messageObject.Ex) {
+        // if error object isn't passed with message & duplicate errors cap per minute isn't exceeded, create a string exception
+        if (level.toLowerCase() === 'error' && !messageObject.Ex && error.checkErrorLimitMessage(data.ex)) {
             messageObject.Ex = error.formatEx(err, null, msg);
         }
 
-        if ((level.toLowerCase() === 'error' && error.checkErrorLimitMessage(messageObject.Ex)) || level.toLowerCase() !== 'error') {
-            storage.push(messageObject);
-            // remove the earliest message from the queue if message cap is exceeded
-            if (storage.length === CONFIG.MSG.QUEUE_CAP) {
-                storage.shift();
-            }
+        storage.push(messageObject);
+
+        // remove the earliest message from the queue if message cap is exceeded
+        if (storage.length === CONFIG.MSG.QUEUE_CAP) {
+            storage.shift();
         }
     },
 
-    /* start sending logs after IdentifyApp call is done
-    */
+    // start sending logs after IdentifyApp call is done
     start: function start() {
         timeout = setTimeout(sendLogs, delay);
     },
+
     // reset current delay schedule, push exception to the queue, send data and run the callback
     sendException: function sendException(err, req, cb) {
+        // check if messages are being sent right now
         var check = function check() {
 
             if (sendingLogsInProgress) {
@@ -131,7 +133,14 @@ module.exports.methods = {
         this.push('error', err.message, [err], req);
         check();
     },
+    // drain the queue and send the messages before server closes
+    drain : function drain() {
+        if (storage.length) {
+            api.methods.postLogsSync(storage);
+        }
+    },
 
+    // basic logging method
     log: function log(level, msg) {
         var meta = Array.prototype.slice.call(arguments, 2);
         var levels = ['error', 'debug', 'warn', 'info', 'trace'];
@@ -140,11 +149,10 @@ module.exports.methods = {
         if (levels.indexOf(level.toLowerCase()) < 0) {
             throw new TypeError(level + ' level doesn\'t exist');
         }
-        // check the message
+        // check the message itself
         if (typeof msg !== 'string') {
             throw new TypeError('Message must be a string');
         }
-
         this.push(level, msg, meta);
     },