Fix log message when using our API directly. Fix bug in nlog with not picking up exception object

Author: mwatson

Dlls/StackifyLib.nLog/StackifyLib.nLog.dll

@@ -218,28 +218,6 @@ internal LogMsg Translate(LogEventInfo loggingEvent)
                     }
                 }
             }
-           
-
-            StackifyError error = null;
-
-            if (loggingEvent.Exception != null && loggingEvent.Exception is StackifyError)
-            {
-                error = (StackifyError) loggingEvent.Exception;
-            }
-            else if (loggingEvent.Exception != null)
-            {
-                error = StackifyError.New((Exception)loggingEvent.Exception);
-            }
-
-            var diags = GetDiagnosticContextProperties();
-            if (diags != null && diags.ContainsKey("transid"))
-            {
-                msg.TransID = diags["transid"].ToString();
-                diags.Remove("transid");
-            }
-
-
-     
 
             string formattedMessage;
 
@@ -257,29 +235,73 @@ internal LogMsg Translate(LogEventInfo loggingEvent)
             msg.Msg = (formattedMessage ?? "").Trim();
 
             object debugObject = null;
+            Dictionary<string, object> args = new Dictionary<string, object>();
 
             if ((loggingEvent.Parameters != null) && (loggingEvent.Parameters.Length > 0))
             {
-                debugObject = loggingEvent.Parameters[0];
 
-                //if the debug param is the same as the logging message itself, suppress it
-                if (debugObject != null && debugObject.ToString() == msg.Msg)
-                {
-                    debugObject = null;
-                }
-                else if (logAllParams ?? true)
+                for (int i = 0; i < loggingEvent.Parameters.Length; i++)
                 {
-                    Dictionary<string, object> args = new Dictionary<string, object>();
+                    var item = loggingEvent.Parameters[i];
 
-                    for (int i = 0; i < loggingEvent.Parameters.Length; i++)
+                    if (item == null)
+                    {
+                        continue;
+                    }
+                    else if (item is Exception)
+                    {
+                        if (loggingEvent.Exception == null)
+                        {
+                            loggingEvent.Exception = (Exception)item;
+                        }
+                    }
+                    else if (item.ToString() == msg.Msg)
+                    {
+                        //ignore it.   
+                    }
+                    else if (logAllParams ?? true)
                     {
                         args["arg" + i] = loggingEvent.Parameters[i];
+                        debugObject = item;
                     }
+                    else
+                    {
+                        debugObject = item;
+                    }
+                }
 
+                if ((logAllParams ?? true) && args != null && args.Count > 1)
+                {
                     debugObject = args;
                 }
             }
 
+
+            StackifyError error = null;
+
+            if (loggingEvent.Exception != null && loggingEvent.Exception is StackifyError)
+            {
+                error = (StackifyError) loggingEvent.Exception;
+            }
+            else if (loggingEvent.Exception != null)
+            {
+                error = StackifyError.New((Exception)loggingEvent.Exception);
+            }
+
+            var diags = GetDiagnosticContextProperties();
+            if (diags != null && diags.ContainsKey("transid"))
+            {
+                msg.TransID = diags["transid"].ToString();
+                diags.Remove("transid");
+            }
+
+
+     
+
+
+
+
+
             if (debugObject != null)
             {
                 msg.data = StackifyLib.Utils.HelperFunctions.SerializeDebugData(debugObject, true, diags);

Dlls/StackifyLib/StackifyLib.dll

@@ -177,24 +177,37 @@ public static void QueueLogObject(StackifyLib.Models.LogMsg msg)
 
                     if (msg.Ex != null)
                     {
+                        if (string.IsNullOrEmpty(msg.Level))
+                        {
+                            msg.Level = "ERROR";
+                        }
+
+                        string origMsg = msg.Msg;
+
+                        if (msg.Msg != null && msg.Ex != null)
+                        {
+                            msg.Msg += "\r\n" + msg.Ex.ToString();
+                        }
+                        else if (msg.Msg == null && msg.Ex != null)
+                        {
+                            msg.Msg = msg.Ex.ToString();
+                        }
+
                         if (!StackifyError.IgnoreError(msg.Ex) && _LogClient.ErrorShouldBeSent(msg.Ex))
                         {
-                            if (!string.IsNullOrEmpty(msg.Msg))
+                            if (!string.IsNullOrEmpty(origMsg))
                             {
-                                msg.Ex.SetAdditionalMessage(msg.Msg);
+                                msg.Ex.SetAdditionalMessage(origMsg);
                             }
 
-                            msg.Msg = msg.Ex.ToString();
+                            //remove because of so many errors
+                            msg.Ex = null;
                         }
                         else
                         {
                             msg.Msg += " #errorgoverned";
                         }
-
-                        if (string.IsNullOrEmpty(msg.Level))
-                        {
-                            msg.Level = "ERROR";
-                        }
+                  
                     }
 
                     _LogClient.QueueMessage(msg);