Added support to Async Logging and much more

README.md

@@ -1,4 +1,4 @@
 log4net-loggly
 ==============
 
-Custom log4net appenders for importing logging events to loggly.
+This fork is not maintained. Please see the official version at https://github.com/loggly/log4net-loggly, and Loggly's documentation at https://www.loggly.com/docs/net-logs/.

source/log4net-loggly-console/App.config

@@ -1,31 +1,33 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<configSections>
 		<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
 	</configSections>
 	<log4net>
-		<root>
-			<level value="ALL" />
-			<appender-ref ref="LogglyAppender" />
-			<appender-ref ref="ColoredConsoleAppender" />
-		</root>
-		<appender name="ColoredConsoleAppender" type="log4net.Appender.ColoredConsoleAppender">
-			<mapping>
-				<level value="ERROR" />
-				<foreColor value="White" />
-				<backColor value="Red, HighIntensity" />
-			</mapping>
-			<layout type="log4net.Layout.PatternLayout">
-				<conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline" />
-			</layout>
-		</appender>
-		<appender name="LogglyAppender" type="log4net.loggly.LogglyAppender, log4net-loggly">
-			<rootUrl value="https://logs.loggly.com/" />
-			<inputKey value="eb952942-e7c0-4f37-9746-8f018d329595" />
-		</appender>
-		<appender name="LogglyBufferringAppender" type="log4net.loggly.LogglyBufferringAppender, log4net-loggly">
-			<rootUrl value="https://logs.loggly.com/" />
-			<inputKey value="eb952942-e7c0-4f37-9746-8f018d329595" />
-		</appender>
+    <root>
+      <level value="ALL" />
+      <appender-ref ref="LogglyAppender" />
+      <appender-ref ref="ConsoleAppender" />
+    </root>
+    <appender name="LogglyAppender" type="log4net.loggly.LogglyAppender, log4net-loggly">
+      <rootUrl value="http://logs-01.loggly.com/" />
+      <inputKey value="customer-token" />
+      <tag value="log4net-test" />
+      <logicalThreadContextKeys value="LogicalThread1,InnerLogicalThreadContext" />
+      <globalContextKeys value="GlobalContextPropertySample" />
+    </appender>
+    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date [%thread] %-5level %logger [%property{NDC1}] - %message%newline" />
+      </layout>
+    </appender>
 	</log4net>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.11.0" newVersion="1.2.11.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>

source/log4net-loggly-console/Program.cs

@@ -1,66 +1,97 @@
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using log4net;
+using log4net.Core;
 
 namespace log4net_loggly_console
 {
-	class Program
+    class GlobalContextTest : IFixingRequired
+    {
+        public object GetFixedObject()
+        {
+            return ToString();
+        }
+
+        public override string ToString()
+        {
+            return DateTime.UtcNow.Millisecond.ToString();
+        }
+    }
+
+    class Program
 	{
-		static void Main(string[] argArray)
-		{
-			log4net.Config.XmlConfigurator.Configure();
+        static void Main(string[] argArray)
+        {
+            GlobalContext.Properties["GlobalContextPropertySample"] = new GlobalContextTest();
+
+            log4net.Config.XmlConfigurator.Configure();
+
+            var log = LogManager.GetLogger(typeof(Program));
+
+            Thread thread = Thread.CurrentThread;
+            thread.Name = "Main Thread";
+            ThreadContext.Properties["MainThreadContext"] = "MainThreadContextValue";
+            log.Info("Thread test");
+            log.Error("oops", new ArgumentOutOfRangeException("argArray"));
+            log.Warn("hmmm", new ApplicationException("app exception"));
+            log.Info("yawn");
+
+            Thread newThread1 = new Thread(() =>
+            {
+                Thread curntThread = Thread.CurrentThread;
+                curntThread.Name = "Inner thread 1";
+                ThreadContext.Properties["InnerThread1Context"] = "InnerThreadContext1Values";
+                LogicalThreadContext.Properties["InnerLogicalThreadContext"] = "InnerLogicalThreadContextValues";
+
+                using (ThreadContext.Stacks["NDC1"].Push("StackValue1"))
+                {
+                    log.Info("this is an inner thread 1");
+
+                    using (ThreadContext.Stacks["NDC1"].Push("StackValue2"))
+                    {
+                        log.Info("inner ndc of inner thread 1");
+                    }
+                }
+
+                using (LogicalThreadContext.Stacks["LogicalThread1"].Push("LogicalThread1_Stack"))
+                {
+                    log.Info("logical thread context 1 stack");
+                    using (LogicalThreadContext.Stacks["LogicalThread1"].Push("LogicalThread1_Stack_2"))
+                    {
+                        log.Info("logical thread context 2 stack");
+                    }
+                }
+
+                log.Info("without ndc of inner thread 1");
+            });
+
+            newThread1.Start();
+
+            Thread newThread2 = new Thread(() =>
+            {
+                Thread curntThread = Thread.CurrentThread;
+                curntThread.Name = "Inner thread 2";
+                ThreadContext.Properties["InnerThread2Context"] = "InnerThreadContext2Values";
+                log.Info("this is an inner thread 2");
+            });
+
+            newThread2.Start();
 
-			var log = LogManager.GetLogger(typeof (Program));
-
-			var args = ParseArgs(argArray);
-			for (int i = 0; i < args.Repeat; i++)
-			{
-				try
-				{
-					log.Error("oops", new ArgumentOutOfRangeException("argArray"));
-					log.Warn("hmmm", new ApplicationException("app exception"));
-					log.Info("yawn");
-					log.Debug("zzzz");
-				}
-				catch (Exception e)
-				{
-					Console.WriteLine(e);
-				}
-			}
-
-			Thread.Sleep(10000);
-		}
-
-		private static Args ParseArgs(string[] argArray)
-		{
-			var args = new Args{Repeat = 1};
-			Action<string> nextArg = null;
-			foreach (var a in argArray)
-			{
-				if (nextArg != null)
-				{
-					nextArg(a);
-					nextArg = null;
-					continue;
-				}
-				if (a.StartsWith("-") || a.StartsWith("/"))
-				{
-					switch (a.Substring(1))
-					{
-						case "r":
-							nextArg = s => args.Repeat = int.Parse(s);
-							break;
-						default:
-							throw new ArgumentOutOfRangeException("unknown arg: " + a);
-					}
-				}
-			}
-			return args;
-		}
-
-		public class Args
-		{
-			public int Repeat { get; set; }
-		}
+            //Test self referencing
+			var parent = new Person { Name = "John Smith" };
+			var child1 = new Person { Name = "Bob Smith", Parent = parent };
+			var child2 = new Person { Name = "Suzy Smith", Parent = parent };
+			parent.Children = new List<Person> { child1, child2 };
+			log.Info(parent);
+
+            log.Debug("zzzz");
+            log.InfoFormat("Loggly is the best {0} to collect Logs.", "service");
+            log.Info(new { type1 = "newcustomtype", value1 = "newcustomvalue" });
+            log.Info(new TestObject());
+            log.Info(null);
+
+            Console.ReadKey();
+        }
 	}
 }

source/log4net-loggly-console/TestObject.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace log4net_loggly_console
+{
+    class TestObject
+    {
+        public string TField1 { get; set; }
+        public string TField2 { get; set; }
+        public string TField3 { get; set; }
+        public object TOField4 { get; set; }
+
+        public TestObject()
+        {
+            TField1 = "testValue1";
+            TField2 = "testValue2";
+            TField3 = string.Empty;
+            TOField4 = new { TOFF1 = "TOFFValue1", TOFF2 = "TOFFValue2" };
+        }
+    }
+	//test self referencing
+	class Person
+	{
+		public string Name;
+		public Person Parent;
+		public List<Person> Children;
+	}
+
+	class Child : Person
+	{
+		public string Name;
+
+	}
+}

source/log4net-loggly-console/log4net-loggly-console.csproj

@@ -35,10 +35,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net">
-      <HintPath>..\packages\log4net.2.0.0\lib\net40-client\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Text">
-      <HintPath>..\packages\ServiceStack.Text.3.8.5\lib\net35\ServiceStack.Text.dll</HintPath>
+      <HintPath>..\packages\log4net.2.0.3\lib\net40-client\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -51,6 +48,7 @@
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestObject.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config">

source/log4net-loggly-console/packages.config

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.0" targetFramework="net40-Client" />
-  <package id="ServiceStack.Text" version="3.8.5" targetFramework="net40-Client" />
 </packages>

source/log4net-loggly/ILogglyAppenderConfig.cs

@@ -5,6 +5,10 @@ public interface ILogglyAppenderConfig
 		string RootUrl { get; set; }
 		string InputKey { get; set; }
 		string UserAgent { get; set; }
+		string LogMode { get; set; }
 		int TimeoutInSeconds { get; set; }
+		string Tag { get; set; }
+		string LogicalThreadContextKeys { get; set; }
+		string GlobalContextKeys { get; set; }
 	}
 }

source/log4net-loggly/ILogglyClient.cs

@@ -2,6 +2,6 @@ namespace log4net.loggly
 {
 	public interface ILogglyClient
 	{
-		void Send(ILogglyAppenderConfig config, string inputKey, string message);
+		void Send(ILogglyAppenderConfig config, string message);
 	}
 }

source/log4net-loggly/ILogglyFormatter.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using log4net.Core;
+using System;
 
 namespace log4net.loggly
 {
@@ -8,5 +9,14 @@ public interface ILogglyFormatter
 		void AppendAdditionalLoggingInformation(ILogglyAppenderConfig unknown, LoggingEvent loggingEvent);
 		string ToJson(LoggingEvent loggingEvent);
 		string ToJson(IEnumerable<LoggingEvent> loggingEvents);
+
+        /// <summary>
+        /// Merged Layout formatted log with the formatted timestamp
+        /// </summary>
+        /// <param name="renderedLog"></param>
+        /// <param name="timeStamp"></param>
+        /// <returns></returns>
+        string ToJson(string renderedLog, DateTime timeStamp);
+
 	}
 }