Proper exception printout

phillipp · Jul 13, 2012 · 0d984d7 · 0d984d7
1 parent bf09759
commit 0d984d7
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/src/NAppUpdate.Framework/Common/Exceptions.cs b/src/NAppUpdate.Framework/Common/Exceptions.cs
@@ -10,6 +10,17 @@ public NAppUpdateException() : base() { }
         public NAppUpdateException(string message) : base(message) { }
         public NAppUpdateException(string message, Exception ex) : base(message, ex) { }
         public NAppUpdateException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+
+		public override string ToString()
+		{
+			var ret = Message;
+			if (!string.IsNullOrEmpty(ret)) ret += Environment.NewLine;
+			if (InnerException != null)
+				ret += InnerException;
+			else
+				ret += StackTrace;
+			return ret;
+		}
     }
 
 	[Serializable]

diff --git a/src/NAppUpdate.Framework/Common/Logger.cs b/src/NAppUpdate.Framework/Common/Logger.cs
@@ -13,14 +13,28 @@ public enum SeverityLevel
 			Error
 		}
 
-		[Serializable]
-		public class LogItem
-		{
-			public DateTime Timestamp { get; set; }
-			public string Message { get; set; }
-			public Exception Exception { get; set; }
-			public SeverityLevel Severity { get; set; }
-		}
+    	[Serializable]
+    	public class LogItem
+    	{
+    		public DateTime Timestamp { get; set; }
+    		public string Message { get; set; }
+    		public Exception Exception { get; set; }
+    		public SeverityLevel Severity { get; set; }
+
+    		public override string ToString()
+    		{
+    			if (Exception == null)
+    				return string.Format("{0,-25}\t{1}\t{2}",
+    				                     Timestamp.ToShortDateString() + " " + Timestamp.ToString("HH:mm:ss.fff"),
+    				                     Severity,
+    				                     Message);
+
+    			return string.Format("{0,-25}\t{1}\t{2}{3}{4}",
+    			                     Timestamp.ToShortDateString() + " " + Timestamp.ToString("HH:mm:ss.fff"),
+    			                     Severity,
+    			                     Message, Environment.NewLine, Exception);
+    		}
+    	}
 
     	public List<LogItem> LogItems { get; private set; }