/[AnywhereTS-MSSQL]/trunk/TSAdminTool/Program.cs
ViewVC logotype

Diff of /trunk/TSAdminTool/Program.cs

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- trunk/TSAdminTool/Program.cs	2012/07/12 19:34:37	67
+++ trunk/TSAdminTool/Program.cs	2012/07/12 20:47:35	70
@@ -31,6 +31,7 @@
         }
         static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs args)
         {
+            DialogResult result = DialogResult.Cancel;
             Exception e = (Exception)args.ExceptionObject;
             if (e == null)
             {
@@ -40,34 +41,37 @@
             if (e.GetType() == typeof(SqlException))
             {
                 SqlException sql_ex = (e as SqlException);
-                Stack stack = new Stack();
-                using (log4net.NDC.Push(string.Format("SqlException: ID={0} MESSAGE={1}{2}Diagnostics:{2}{3}", sql_ex.Number.ToString(), sql_ex.Message, System.Environment.NewLine, sql_ex.ToString())))
+                List<string> strs = new List<string>();
+                using (log4net.NDC.Push(string.Format("{0}: ID={1} MESSAGE={2}{3}Diagnostics:{3}{4}", sql_ex.GetType().Name, sql_ex.Number.ToString(), sql_ex.Message, System.Environment.NewLine, sql_ex.ToString())))
                 {
-                    stack = log4net.NDC.CloneStack();
-                    Logging.ATSAdminLog.Error("Encountered unhandled SqlException");
+                    strs = Logging.GetMessagesFromThreadContextStack("NDC");
+                    Logging.ATSAdminLog.Error("Encountered unhandled Exception");
                 }
-                List<object> strs = new List<object>(stack.ToArray());
-                strs.Reverse();
                 StringBuilder builder = new StringBuilder();
-                foreach (object str in strs) { builder.AppendLine(str.ToString()); }
-                builder.AppendLine("Encountered unhandled Exception");
-                MessageBox.Show(builder.ToString());
+                foreach (string str in strs) { builder.AppendLine(str); }
+                result = ShowAbortRetryIgnoreDialog("Encountered unhandled Exception", builder.ToString());
+                if (result == DialogResult.Abort)
+                    Application.Exit();
             }
             else
             {
-                Stack stack = new Stack();
-                using (log4net.NDC.Push(string.Format("Exception: MESSAGE={0}{1}Diagnostics:{1}{2}", e.Message, System.Environment.NewLine, e.ToString())))
+                List<string> strs = new List<string>();
+                using (log4net.NDC.Push(string.Format("{0}: MESSAGE={1}{2}Diagnostics:{2}{3}", e.GetType().Name, e.Message, System.Environment.NewLine, e.ToString())))
                 {
-                    stack = log4net.NDC.CloneStack();
+                    strs = Logging.GetMessagesFromThreadContextStack("NDC");
                     Logging.ATSAdminLog.Error("Encountered unhandled Exception");
-                }                
-                List<object> strs = new List<object>(stack.ToArray());
-                strs.Reverse();
+                }
                 StringBuilder builder = new StringBuilder();
-                foreach (object str in strs) { builder.AppendLine(str.ToString()); }
-                builder.AppendLine("Encountered unhandled Exception");
-                MessageBox.Show(builder.ToString());
+                foreach (string str in strs) { builder.AppendLine(str); }
+                result = ShowAbortRetryIgnoreDialog("Encountered unhandled Exception", builder.ToString());
+                if (result == DialogResult.Abort)
+                    Application.Exit();
             }
         }
+        // Creates the error message and displays it.
+        private static DialogResult ShowAbortRetryIgnoreDialog(string title, string message)
+        {
+            return MessageBox.Show(message, title, MessageBoxButtons.AbortRetryIgnore, MessageBoxIcon.Stop, MessageBoxDefaultButton.Button1);
+        }
     }
 }
\ No newline at end of file

 

  ViewVC Help
Powered by ViewVC 1.1.22