Move level-to-text conversion to formatter

eleven41 · Oct 24, 2013 · f875c5f · f875c5f
1 parent 86225de
commit f875c5f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/Eleven41.Logging/ITextWriterFormatter.cs b/Eleven41.Logging/ITextWriterFormatter.cs
@@ -6,6 +6,6 @@ namespace Eleven41.Logging
 {
 	public interface ITextWriterFormatter
 	{
-		void WriteText(System.IO.TextWriter writer, string level, DateTime dateTime, string text);
+		void WriteText(System.IO.TextWriter writer, LogLevels level, DateTime dateTime, string text);
 	}
 }
diff --git a/Eleven41.Logging/TextWriterFormatters/BareTextWriterFormatter.cs b/Eleven41.Logging/TextWriterFormatters/BareTextWriterFormatter.cs
@@ -6,7 +6,7 @@ namespace Eleven41.Logging.TextWriterFormatters
 {
 	public class BareTextWriterFormatter : ITextWriterFormatter
 	{
-		public void WriteText(System.IO.TextWriter writer, string level, DateTime dateTime, string text)
+		public void WriteText(System.IO.TextWriter writer, LogLevels level, DateTime dateTime, string text)
 		{
 			writer.WriteLine("{0}", text);
 		}

diff --git a/Eleven41.Logging/TextWriterFormatters/DefaultTextWriterFormatter.cs b/Eleven41.Logging/TextWriterFormatters/DefaultTextWriterFormatter.cs
@@ -7,10 +7,31 @@ namespace Eleven41.Logging.TextWriterFormatters
 {
 	public class DefaultTextWriterFormatter : ITextWriterFormatter
 	{
-		public void WriteText(System.IO.TextWriter writer, string level, DateTime dateTime, string text)
+		public void WriteText(System.IO.TextWriter writer, LogLevels level, DateTime dateTime, string text)
 		{
+			string sLevel;
+			switch (level)
+			{
+				case LogLevels.Info:
+				default:
+					sLevel = "I";
+					break;
+
+				case LogLevels.Diagnostic:
+					sLevel = "D";
+					break;
+
+				case LogLevels.Warning:
+					sLevel = "W";
+					break;
+
+				case LogLevels.Error:
+					sLevel = "E";
+					break;
+			}
+
 			writer.WriteLine("{0}:{1} {2} [{4}]: {3}",
-				level, dateTime.ToShortDateString(), dateTime.ToLongTimeString(),
+				sLevel, dateTime.ToShortDateString(), dateTime.ToLongTimeString(),
 				text, Thread.CurrentThread.GetHashCode());
 		}
 	}

diff --git a/Eleven41.Logging/TextWriterLog.cs b/Eleven41.Logging/TextWriterLog.cs
@@ -124,40 +124,35 @@ public ITextWriterFormatter TextWriterFormatter
 		/// <param name="sMsg">Message to log.</param>
 		public void Log(DateTime dt, LogLevels level, string sMsg)
 		{
-			string sLevel;
 			switch (level)
 			{
 				case LogLevels.Info:
 				default:
 					if (!LogInfos)
 						return;
-					sLevel = "I";
 					break;
 
 				case LogLevels.Diagnostic:
 					if (!LogDiagnostics)
 						return;
-					sLevel = "D";
 					break;
 
 				case LogLevels.Warning:
 					if (!LogWarnings)
 						return;
-					sLevel = "W";
 					break;
 
 				case LogLevels.Error:
 					if (!LogErrors)
 						return;
-					sLevel = "E";
 					break;
 			}
 
 			// Split the message into lines
 			string[] lines = System.Text.RegularExpressions.Regex.Split(sMsg, "\r\n|\r|\n");
 			foreach (var line in lines)
 			{
-				this.TextWriterFormatter.WriteText(_writer, sLevel, dt, line);
+				this.TextWriterFormatter.WriteText(_writer, level, dt, line);
 			}
 			_writer.Flush();
 		}