Skip to content

Commit 28aeccd

Browse files
committed
Add ability to RestoreFailedJobs
1 parent 581f7c3 commit 28aeccd

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

MyApp.ServiceInterface/JobServices.cs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,17 @@ public void Any(FailJob request)
3939
});
4040
}
4141

42-
public object Any(RestoreModelQueues request)
42+
public async Task<object> Any(RestoreModelQueues request)
4343
{
4444
var pendingJobs = workerQueues.GetAll();
4545
var pendingJobIds = pendingJobs.Select(x => x.Id).ToSet();
46-
var incompleteJobs = Db.Select(Db.From<PostJob>().Where(x => x.CompletedDate == null));
46+
var incompleteJobs = await Db.SelectAsync(Db.From<PostJob>().Where(x => x.CompletedDate == null));
4747
var missingJobs = incompleteJobs.Where(x => !pendingJobIds.Contains(x.Id) && x.StartedDate == null).ToList();
4848
var startedJobs = incompleteJobs.Where(x => x.StartedDate != null).ToList();
4949
var lostJobsBefore = DateTime.UtcNow.Add(TimeSpan.FromMinutes(-5));
5050
var lostJobs = startedJobs.Where(x => x.StartedDate < lostJobsBefore && missingJobs.All(m => m.Id != x.Id)).ToList();
51-
var failedJobsCount = Db.Count(Db.From<PostJob>().Where(x => x.CompletedDate != null && x.Error != null));
51+
var failedJobs = await Db.SelectAsync(Db.From<PostJob>().Where(x => x.CompletedDate != null && x.Error != null));
52+
var restoreFailedJobs = request.RestoreFailedJobs == true;
5253

5354
foreach (var lostJob in lostJobs)
5455
{
@@ -58,6 +59,11 @@ public object Any(RestoreModelQueues request)
5859
{
5960
workerQueues.Enqueue(missingJob);
6061
}
62+
foreach (var failedJob in failedJobs)
63+
{
64+
workerQueues.Enqueue(failedJob);
65+
}
66+
var failedSuffix = restoreFailedJobs ? ", restored!" : "";
6167

6268
return new StringsResponse
6369
{
@@ -66,7 +72,7 @@ public object Any(RestoreModelQueues request)
6672
$"{incompleteJobs.Count} incomplete jobs in database",
6773
$"{startedJobs.Count} jobs being processed by workers",
6874
$"{missingJobs.Count} missing and {lostJobs.Count} lost jobs re-added to queue",
69-
$"{failedJobsCount} failed jobs",
75+
$"{failedJobs.Count} failed jobs{failedSuffix}",
7076
]
7177
};
7278
}

MyApp.ServiceModel/Posts.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,10 @@ public class ViewModelQueuesResponse
109109
}
110110

111111
[ValidateHasRole(Roles.Moderator)]
112-
public class RestoreModelQueues : IGet, IReturn<StringsResponse> {}
112+
public class RestoreModelQueues : IGet, IReturn<StringsResponse>
113+
{
114+
public bool? RestoreFailedJobs { get; set; }
115+
}
113116

114117
[ValidateHasRole(Roles.Moderator)]
115118
public class FailJob : IPost, IReturnVoid

0 commit comments

Comments
 (0)