Add schedule information to UnobservedTaskException event. Fixes #31

fluentscheduler · Nov 14, 2013 · 2867910 · 2867910
1 parent 6a1bbce
commit 2867910
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 10 deletions.
diff --git a/ConsoleTester/Program.cs b/ConsoleTester/Program.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using FluentScheduler;
+using FluentScheduler.Model;
 
 namespace ConsoleTester
 {
@@ -58,9 +59,9 @@ static void Main(string[] args)
 			Console.ReadKey();
 		}
 
-		static void TaskManager_UnobservedTaskException(Task sender, UnhandledExceptionEventArgs e)
+		static void TaskManager_UnobservedTaskException(TaskExceptionInformation sender, UnhandledExceptionEventArgs e)
 		{
-			Console.WriteLine("Something went wrong: " + e.ExceptionObject);
+			Console.WriteLine("Something went wrong with task: " + sender.Name + "\n" + e.ExceptionObject);
 		}
 	}
 

diff --git a/FluentScheduler.Webtester/Global.asax.cs b/FluentScheduler.Webtester/Global.asax.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Threading.Tasks;
 using System.Web.Mvc;
+using FluentScheduler.Model;
 using FluentScheduler.WebTester.Infrastructure.Tasks;
 using ServiceStack.Logging;
 
@@ -23,10 +23,10 @@ protected void Application_End(object sender, EventArgs e)
 			TaskManager.Stop();
 		}
 
-		static void TaskManager_UnobservedTaskException(Task sender, UnhandledExceptionEventArgs e)
+		static void TaskManager_UnobservedTaskException(TaskExceptionInformation sender, UnhandledExceptionEventArgs e)
 		{
 			var log = LogManager.GetLogger(typeof(MvcApplication));
-			log.Fatal("An error happened with a scheduled task: " + e.ExceptionObject);
+			log.Fatal("An error happened with a scheduled task: " + sender.Name + "\n" + e.ExceptionObject);
 		}
 	}
 }
diff --git a/FluentScheduler/FluentScheduler.csproj b/FluentScheduler/FluentScheduler.csproj
@@ -42,6 +42,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="GenericEventHandler.cs" />
+    <Compile Include="Model\TaskExceptionInformation.cs" />
     <Compile Include="TaskFactory.cs" />
     <Compile Include="Model\TaskEndScheduleInformation.cs" />
     <Compile Include="Model\TaskStartScheduleInformation.cs" />

diff --git a/FluentScheduler/Model/TaskExceptionInformation.cs b/FluentScheduler/Model/TaskExceptionInformation.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Threading.Tasks;
+
+namespace FluentScheduler.Model
+{
+	public class TaskExceptionInformation
+	{
+		public string Name { get; set; }
+		public Task Task { get; set; }
+	}
+}
diff --git a/FluentScheduler/TaskManager.cs b/FluentScheduler/TaskManager.cs
@@ -15,7 +15,7 @@ namespace FluentScheduler
 	public static class TaskManager
 	{
 		public static ITaskFactory TaskFactory { get; set; }
-		public static event GenericEventHandler<Task, UnhandledExceptionEventArgs> UnobservedTaskException;
+		public static event GenericEventHandler<TaskExceptionInformation, UnhandledExceptionEventArgs> UnobservedTaskException;
 		public static event GenericEventHandler<TaskStartScheduleInformation, EventArgs> TaskStart;
 		public static event GenericEventHandler<TaskEndScheduleInformation, EventArgs> TaskEnd;
 
@@ -85,11 +85,18 @@ public static void Initialize(Registry registry)
 			RunAndInitializeSchedule(immediateTasks);
 		}
 
-		private static void RaiseUnobservedTaskException(Task t)
+		private static void RaiseUnobservedTaskException(Schedule schedule, Task t)
 		{
 			var handler = UnobservedTaskException;
 			if (handler != null && t.Exception != null)
-				handler(t, new UnhandledExceptionEventArgs(t.Exception.InnerException, true));
+			{
+				var info = new TaskExceptionInformation
+					{
+						Name = schedule.Name,
+						Task = t
+					};
+				handler(info, new UnhandledExceptionEventArgs(t.Exception.InnerException, true));
+			}
 		}
 		private static void RaiseTaskStart(Schedule schedule, DateTime startTime)
 		{
@@ -213,7 +220,7 @@ internal static void StartTask(Schedule schedule)
 					RaiseTaskEnd(schedule, start, stopwatch.Elapsed);
 				}
 			}, TaskCreationOptions.PreferFairness);
-			mainTask.ContinueWith(RaiseUnobservedTaskException, TaskContinuationOptions.OnlyOnFaulted);
+			mainTask.ContinueWith(task => RaiseUnobservedTaskException(schedule, task), TaskContinuationOptions.OnlyOnFaulted);
 		}
 
 		/// <summary>

diff --git a/FluentScheduler/package.nuspec b/FluentScheduler/package.nuspec
@@ -11,7 +11,10 @@
 		<summary>A task scheduler that uses fluent interface to configure schedules. Useful for running cron jobs/automated tasks from your application.</summary>
 		<language>en-US</language>
 		<tags>Library task-scheduler tasks cron</tags>
-		<releaseNotes>v2.0 Changes:
+		<releaseNotes>v3.0 Changes:
+* Add schedule information to UnobservedTaskException event
+
+v2.0 Changes:
 * Strongly named assembly
 * TaskManager.TaskFactory replaces Registry.GetTaskInstance() method
 * Allow basic continuations with schedules