Fixed issue with web backgrounder and perf events

(PagerDuty Incident NuGet#105)
OmniFinancial · Jun 10, 2014 · 90c210d · 90c210d
1 parent e4e3428
commit 90c210d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/NuGetGallery/Diagnostics/ProcessPerfEvents.cs b/src/NuGetGallery/Diagnostics/ProcessPerfEvents.cs
@@ -22,7 +22,7 @@ public ProcessPerfEvents(TimeSpan interval, string logDirectory, IEnumerable<str
 
         public override Task Execute()
         {
-            return Task.WhenAll(Queues.Select(q => ProcessQueue(q)));
+            return new Task(() => Task.WaitAll(Queues.Select(q => ProcessQueue(q)).ToArray()));
         }
 
         private async Task ProcessQueue(string queue)

diff --git a/src/NuGetGallery/Infrastructure/Jobs/NuGetJobCoordinator.cs b/src/NuGetGallery/Infrastructure/Jobs/NuGetJobCoordinator.cs
@@ -46,7 +46,10 @@ private static Task CreateWrappingContinuingTask(Task originalTask, Action<Task>
 
             var wrapper = new Task(() =>
             {
-                originalTask.Start();
+                if (originalTask.Status == TaskStatus.WaitingForActivation)
+                {
+                    originalTask.Start();
+                }
                 continuation.Wait();
             });