Merge pull request #4 from alexk-blackops/master

Logger name fix + stack trace source method fix

Author: eric-martin

config/config.js

@@ -20,5 +20,6 @@ module.exports = {
     IDENTIFY_DELAY: 300000, // 5 minutes delay if identifyApp call failed
     COOKIE_MASK: 'X-MASKED-X', // cookie headers and values mask
     LOGGER_VERSION: 'Node.js Stackify v.1.0',
+    WINSTON_LOGGER_VERSION: 'Node.js Winston-Stackify v.1.0',
     X_STACKIFY_PV: 'V1'
 };

index.js

@@ -1,10 +1,12 @@
 var api       = require('./lib/api'), // wrappers for API calls
     exception = require('./lib/exception'),  // exception handler module
-    logger    = require('./lib/logger'); // logging methods module
+    logger    = require('./lib/logger'), // logging methods module
+    CONFIG    = require('./config/config');
 
 module.exports = {
     // start sending logs
     start: function (options) {
+        CONFIG.SELECTED_LOGGER = CONFIG.LOGGER_VERSION;
         api.methods.identifyApp(options);
         exception.catchException(options.exitOnError || false);
         exception.gracefulExitHandler();
@@ -19,6 +21,12 @@ module.exports = {
 
     //common method for handling logged messages
     push: logger.methods.push,
+    // setting logger name to Winston logger if it's used
+    setLoggerName: function (name) {
+        if (name === 'Winston') {
+            CONFIG.SELECTED_LOGGER = CONFIG.WINSTON_LOGGER_VERSION;
+        }
+    },
 
     expressExceptionHandler: exception.expressExceptionHandler
 };

lib/helpers.js

@@ -94,7 +94,7 @@ module.exports.getTrace = function getTrace(err) {
     trace.forEach(function (val) {
         var method = val.methodName || (val.functionName || val.typeName) + '.<anonymous>';
 
-        if (val.fileName ? (val.fileName.search('lib/logger.js') < 0 || val.fileName.search('stackify') < 0) : true) {
+        if (val.fileName ? (val.fileName.search('lib/logger.js') < 0 && val.fileName.search('stackify') < 0) : true) {
             result.push({
                 CodeFileName: val.fileName,
                 LineNum: val.lineNumber,
@@ -146,7 +146,7 @@ module.exports.getPostBody = function getPostBody(messages) {
         ServerName: os.hostname(),
         AppName: CONFIG.APPNAME,
         AppLoc: process.env.PWD,
-        Logger: CONFIG.LOGGER_VERSION,
+        Logger: CONFIG.SELECTED_LOGGER,
         Platform: 'nodejs',
         Msgs : messages
     };