Added a dispatch catch

NuGet · Jan 21, 2014 · 14a16ce · 14a16ce
1 parent c49d518
commit 14a16ce
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/Services/NuCmd/Commands/Work/GetCommand.cs b/src/Services/NuCmd/Commands/Work/GetCommand.cs
@@ -72,7 +72,8 @@ private async Task GetByCriteria(InvocationListCriteria criteria)
                     i.Id,
                     QueuedAt = i.QueuedAt.LocalDateTime,
                     UpdatedAt = i.UpdatedAt.LocalDateTime,
-                    CompletedAt = i.CompletedAt.HasValue ? i.CompletedAt.Value.LocalDateTime : (DateTimeOffset?)null
+                    CompletedAt = i.CompletedAt.HasValue ? i.CompletedAt.Value.LocalDateTime : (DateTimeOffset?)null,
+                    i.LastUpdatedBy
                 });
             }
         }

diff --git a/src/Services/Work/NuGet.Services.Work/Infrastructure/JobRunner.cs b/src/Services/Work/NuGet.Services.Work/Infrastructure/JobRunner.cs
@@ -106,7 +106,24 @@ public virtual async Task Run(CancellationToken cancelToken)
                     {
                         Status = RunnerStatus.Dispatching;
                         Interlocked.Exchange(ref _currentInvocationId, invocation.Id.ToByteArray());
-                        await Dispatch(invocation, cancelToken);
+
+                        Exception dispatchError = null;
+                        try
+                        {
+                            await Dispatch(invocation, cancelToken);
+                        }
+                        catch (Exception ex)
+                        {
+                            dispatchError = ex;
+                        }
+                        if (dispatchError != null)
+                        {
+                            await Queue.Complete(
+                                invocation,
+                                ExecutionResult.Crashed,
+                                dispatchError.ToString(),
+                                null);
+                        }
                         Interlocked.Exchange(ref _currentInvocationId, Guid.Empty.ToByteArray());
                         Status = RunnerStatus.Working;
                     }