Merge pull request #11 from stackify/SF-3437

SF-3437

Author: eric-martin

.gitignore

@@ -1,2 +1,4 @@
 node_modules
-npm-debug.log
+npm-debug.log
+.idea
+*.iml

lib/api.js

@@ -19,18 +19,14 @@ module.exports.methods = {
                 DeviceName: os.hostname(),
                 AppName: appname,
                 ConfiguredAppName: appname,
-                AppLocaton: process.env.PWD
+                AppLocation: process.env.PWD
             },
             callback = function (data) {
                 debug.write('Successfully identified');
 
                 CONFIG.APP_DETAILS = data;
 
-                //start sending logs unless it's not already being sent because of exception
-
-                if (!exc.excCaught) {
-                    logger.methods.start();
-                }
+                logger.methods.start();
 
             },
             fail = function () {
@@ -56,7 +52,6 @@ module.exports.methods = {
             }
 
             options = helpers.getOptions(CONFIG.IDENTIFY_PATH, body, settings ? settings.proxy : undefined);
-            options.headers['X-Stackify-Key'] = settings.apiKey;
 
             debug.write('Identifying the app');
             sender.send(options, callback, fail);
@@ -82,12 +77,12 @@ module.exports.methods = {
                 var sinceFirstError;
                 debug.write('Sending logs failed');
                 if (code === 401) {
-                    delay = CONFIG.DELAY.FIVE_MINUTES;
+                    delay = CONFIG.DELAY.FIVE_MINUTES_DELAY;
                     lastApiError = new Date().getTime();
                 } else {
                     lastApiError = lastApiError || new Date().getTime();
                     sinceFirstError = new Date().getTime() - lastApiError;
-                    delay = Math.min(Math.max(sinceFirstError, CONFIG.DELAY.ONE_SECOND), CONFIG.DELAY.ONE_MINUTE);
+                    delay = Math.min(Math.max(sinceFirstError, CONFIG.DELAY.ONE_SECOND_DELAY), CONFIG.DELAY.ONE_MINUTE_DELAY);
                 }
 
                 setTimeout(function () {

lib/debug.js

@@ -12,7 +12,7 @@ var fs        = require('fs'),
         stream = fs.createWriteStream(log_path, {flags: 'a'});
         stream.write(makeMsg('Debugging started'));
         stream.on('error', function (err) {
-            console.error('Error occured during writing to the log file ', util.inspect(err));
+            console.error('Error occurred during writing to the log file ', util.inspect(err));
         });
     };
 
@@ -31,22 +31,16 @@ module.exports = {
         }
     },
 
-    writeResponse: function (response, close) {
+    writeResponse: function (response) {
         var body = response ? response.body : null,
             msgBody = (body && typeof body === 'object') ? JSON.stringify(response.body, null, 4) : body,
             msg = response ? ('url: ' + response.request.uri.href + ':' + response.request.uri.port + ', method: '
                           + response.req.method + ', status: ' + response.statusCode + '\nresponse: ' + msgBody) : 'no data available';
-        if (close) {
-            this.close('Response received\n' + msg);
-        } else {
-            this.write('Response received\n' + msg);
-        }
+
+        this.write('Response received\n' + msg);
     },
 
     writeRequest: function (request, close) {
-        if (request.body.Msgs) {
-            request.body.Msgs = request.body.Msgs.length + ' messages';
-        }
         if (close) {
             this.close('Request sent\n' + JSON.stringify(request, null, 4));
         } else {

lib/error.js

@@ -10,7 +10,7 @@ var url        = require('url'),
 
 module.exports = {
     /**
-    * Check for duplicate 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 configured limit in one minute
     * don't push it to the queue
     */
     checkErrorLimitMessage : function checkErrorLimitMessage(ex) {
@@ -46,7 +46,7 @@ module.exports = {
             result = {},
             lastElement = trace[trace.length - 1];
 
-        if (not_direct && !exc.excCaught) {
+        if (not_direct) {
             if (lastElement.CodeFileName === 'module.js') {
                 result.SrcMethod = trace[trace.length - 2].Method;
                 result.SrcLine = trace[trace.length - 2].LineNum;                    
@@ -103,9 +103,12 @@ module.exports = {
                 PostData: helpers.getPostData(req)
             };
 
-            if (req.headers.cookie) {
-                ex.WebRequestDetail.Headers.cookie = CONFIG.COOKIE_MASK;
-            }
+            // mask certain headers so data is not sent to Stackify
+            ["cookie", "authorization"].forEach(function(elm){
+                if (req.headers[elm]) {
+                    ex.WebRequestDetail.Headers[elm] = CONFIG.COOKIE_MASK;
+                }
+            });
         }
 
         return ex;

lib/exception.js

@@ -43,10 +43,7 @@ module.exports = {
             return next();
         }
 
-        if (!this.excCaught) {
-            this.excCaught = true;
-            logger.methods.sendException(err, req, cb);
-        }
+        logger.methods.sendException(err, req, cb);
     },
     // drain the queue and send the messages before server closes
     gracefulExitHandler : function gracefulExitHandler() {

lib/helpers.js

@@ -2,7 +2,6 @@ var stackTrace = require('stack-trace'),
 
     path       = require('path'),
     os         = require('os'),
-    qs         = require('querystring'),
 
     CONFIG     = require('../config/config');
 
@@ -185,25 +184,4 @@ module.exports.getHeaders = function getHeaders() {
         'X-Stackify-Key': CONFIG.APIKEY,
         'X-Stackify-PV': CONFIG.X_STACKIFY_PV
     };
-};
-/*
-*** Function for getting post data from the request
-*/
-module.exports.getPostData = function getPostData (req) {
-    return (function() {
-        if (request.method == 'POST') {
-            var body = '';
-            request.on('data', function (data) {
-                body += data;
-
-                // Too much POST data, kill the connection!
-                if (body.length > 1e6)
-                    request.connection.destroy();
-            });
-            request.on('end', function () {
-                var json = qs.parse(body);
-                req.body = json;
-            });
-        }
-    }());
-};
+};