Merge pull request #4 from AdamCLarsen/fix-Log4netContextStack

Add handing for Log4Net Thread Context stacks

Author: sporty81

Src/StackifyLib.log4net.v1_2_10/StackifyAppender.cs

@@ -316,7 +316,19 @@ private Dictionary<string, object> GetDiagnosticContextProperties()
 
                 if (mdcValue != null)
                 {
-                    properties[mdcKey.ToLower()] = mdcValue;
+                    // Check if the property is a Log4net Context Stack,
+                    // If it is, then we want to read it as a string as that is
+                    // the expected behavior for a Log4Net Appender.
+                    var tcs = mdcValue as Apache_log4net.Util.ThreadContextStack;
+                    if (tcs != null)
+                    {
+                        properties[mdcKey.ToLower()] = tcs.ToString();
+                    }
+                    else
+                    {
+                        // for anything else, we will let Json.Net take care of it.
+                        properties[mdcKey.ToLower()] = mdcValue;
+                    }
                 }
             }
 
@@ -326,7 +338,19 @@ private Dictionary<string, object> GetDiagnosticContextProperties()
 
                 if (mdcValue != null)
                 {
-                    properties[mdcKey.ToLower()] = mdcValue;
+                    // Check if the property is a Log4net Context Stack,
+                    // If it is, then we want to read it as a string as that is
+                    // the expected behavior for a Log4Net Appender.
+                    var tcs = mdcValue as Apache_log4net.Util.ThreadContextStack;
+                    if (tcs != null)
+                    {
+                        properties[mdcKey.ToLower()] = tcs.ToString();
+                    }
+                    else
+                    {
+                        // for anything else, we will let Json.Net take care of it.
+                        properties[mdcKey.ToLower()] = mdcValue;
+                    }
                 }
             }
 

Src/StackifyLib.log4net/StackifyAppender.cs

@@ -307,7 +307,19 @@ private Dictionary<string, object> GetDiagnosticContextProperties()
 
                 if (mdcValue != null)
                 {
-                    properties[mdcKey.ToLower()] = mdcValue;
+                    // Check if the property is a Log4net Context Stack,
+                    // If it is, then we want to read it as a string as that is
+                    // the expected behavior for a Log4Net Appender.
+                    var tcs = mdcValue as Apache_log4net.Util.ThreadContextStack;
+                    if (tcs != null)
+                    {
+                        properties[mdcKey.ToLower()] = tcs.ToString();
+                    }
+                    else
+                    {
+                        // for anything else, we will let Json.Net take care of it.
+                        properties[mdcKey.ToLower()] = mdcValue;
+                    }
                 }
             }
 
@@ -317,7 +329,19 @@ private Dictionary<string, object> GetDiagnosticContextProperties()
 
                 if (mdcValue != null)
                 {
-                    properties[mdcKey.ToLower()] = mdcValue;
+                    // Check if the property is a Log4net Context Stack,
+                    // If it is, then we want to read it as a string as that is
+                    // the expected behavior for a Log4Net Appender.
+                    var tcs = mdcValue as Apache_log4net.Util.ThreadContextStack;
+                    if (tcs != null)
+                    {
+                        properties[mdcKey.ToLower()] = tcs.ToString();
+                    }
+                    else
+                    {
+                        // for anything else, we will let Json.Net take care of it.
+                        properties[mdcKey.ToLower()] = mdcValue;
+                    }
                 }
             }