Merge pull request #6 from alexk-blackops/master

source method fix

Author: eric-martin

lib/error.js

@@ -2,6 +2,7 @@ var url        = require('url'),
     os         = require('os'),
 
     helpers    = require('./helpers'),
+    exc        = require('./exception'),
     CONFIG     = require('../config/config'),
 
     // object that contains all the errors and their numbers logged during the current minute
@@ -39,15 +40,29 @@ module.exports = {
         return errorStorage[min][key] <= CONFIG.MSG.MAX_DUP_ERROR_PER_MINUTE;
     },
 
-    // getting source method and source method line of code 
-    getStackTraceItem: function getStackTraceItem(err) {
-        var trace = helpers.getTrace(err);
-        return {
-            SrcMethod: trace[0].Method,
-            SrcLine: trace[0].LineNum
-        };
+    // getting source method and source method line of code, not_direct is a flag indicating if the message was sent via direct logger
+    getStackTraceItem: function getStackTraceItem(err, not_direct) {
+        var trace = helpers.getTrace(err),
+            result = {},
+            lastElement = trace[trace.length - 1];
+
+        if (not_direct && !exc.excCaught) {
+            if (lastElement.CodeFileName === 'module.js') {
+                result.SrcMethod = trace[trace.length - 2].Method;
+                result.SrcLine = trace[trace.length - 2].LineNum;                    
+            } else {
+                result.SrcMethod = lastElement.Method;
+                result.SrcLine = lastElement.LineNum;                    
+            }
+        } else {
+            result.SrcMethod = trace[0].Method;
+            result.SrcLine = trace[0].LineNum;           
+        }
+        
+        return result;
     },
 
+
     // create the exception details object
     formatEx : function formatEx(err, req, msg) {
         var trace = helpers.getTrace(err),

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('winston-stackify') < 0 && val.fileName.search('stackify-logger') < 0) : true) {
             result.push({
                 CodeFileName: val.fileName,
                 LineNum: val.lineNumber,

lib/logger.js

@@ -72,9 +72,9 @@ module.exports.storage = storage;
 
 module.exports.methods = {
     // create the message object, push it to the queue if the queue cap isn't exceeded
-    push : function push(level, msg, meta, req) {
-        var err = new Error(),
-            getStack = error.getStackTraceItem(err),
+    push : function push(level, msg, meta, req, err) {
+        var stackError = err || new Error(),
+            getStack = error.getStackTraceItem(stackError, err),
             messageObject = {
                 Msg: msg,
                 Level: level.toUpperCase(),
@@ -106,7 +106,7 @@ module.exports.methods = {
 
         // 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) {
-            messageObject.Ex = error.formatEx(err, null, msg);
+            messageObject.Ex = error.formatEx(stackError, null, msg);
 
             if (!error.checkErrorLimitMessage(messageObject.Ex)) {
                 delete messageObject.Ex;
@@ -139,7 +139,7 @@ module.exports.methods = {
         };
 
         clearTimeout(timeout);
-        this.push('error', err.message, [err], req);
+        this.push('error', err.message, [err], req, err);
         check();
     },
     // drain the queue and send the messages before server closes