Kolpack-Software-Consulting/LeafWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add params for filtering LeafInputs

Browse Source
This commit is contained in:
poprhythm
2016-04-21 18:30:29 -04:00
parent 1359100670
commit 9e25521034
2 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/DAL/DataService.cs
+2 -13
View File
@@ -50,22 +50,11 @@ namespace LeafWeb.Core.DAL
return _db.LeafInputs.FirstOrDefault(li => li.Id == id); return _db.LeafInputs.FirstOrDefault(li => li.Id == id);
} }
public IQueryable<LeafInput> GetLeafInputs(LeafInputStatusType status) public IQueryable<LeafInput> GetLeafInputs(params LeafInputStatusType[] statuses)
{ {
return return
from file in _db.LeafInputs from file in _db.LeafInputs
where file.CurrentStatus == status where statuses.Contains(file.CurrentStatus)
select file;
}
public IQueryable<LeafInput> GetRunningLeafInputs()
{
return
from file in _db.LeafInputs
where
file.CurrentStatus == LeafInputStatusType.Running ||
file.CurrentStatus == LeafInputStatusType.Starting ||
file.CurrentStatus == LeafInputStatusType.Finishing
select file; select file;
} }
Web/Services/PiscalQueueManager.cs
+22 -20
View File
@@ -1,11 +1,8 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Linq.Expressions;
using System.Threading; using System.Threading;
using Hangfire;
using LeafWeb.Core.Entities; using LeafWeb.Core.Entities;
using LeafWeb.Core.Remote; using LeafWeb.Core.Remote;
using Polly;
namespace LeafWeb.Web.Services namespace LeafWeb.Web.Services
{ {
@@ -40,10 +37,29 @@ namespace LeafWeb.Web.Services
Logger.Trace("ProcessQueue locked, queue already processing"); Logger.Trace("ProcessQueue locked, queue already processing");
} }
} }
private void ClearStalled()
{
var leafInputs =
DataService.GetLeafInputs(
LeafInputStatusType.Starting,
LeafInputStatusType.Finishing
)
.Where(li =>
li.StatusHistory.OrderBy(sh => sh.DateTime).First().DateTime
> DateTime.Now.Subtract(TimeSpan.FromHours(1)))
.ToList();
}
private void StartNextPending() private void StartNextPending()
{ {
var runningLeafInputs = DataService.GetRunningLeafInputs().ToList(); var runningLeafInputs =
DataService.GetLeafInputs(
LeafInputStatusType.Starting,
LeafInputStatusType.Running,
LeafInputStatusType.Finishing
).ToList();
if (runningLeafInputs.Any()) if (runningLeafInputs.Any())
{ {
Logger.Trace("Leaf input(s) currently running"); Logger.Trace("Leaf input(s) currently running");
@@ -77,7 +93,6 @@ namespace LeafWeb.Web.Services
} }
} }
private void UpdateRunning() private void UpdateRunning()
{ {
var running = DataService.GetLeafInputs(LeafInputStatusType.Running).ToList(); var running = DataService.GetLeafInputs(LeafInputStatusType.Running).ToList();
@@ -102,20 +117,7 @@ namespace LeafWeb.Web.Services
case PiscalStatus.Complete: case PiscalStatus.Complete:
DataService.SetLeafInputStatus(leafInput, LeafInputStatusType.Finishing); DataService.SetLeafInputStatus(leafInput, LeafInputStatusType.Finishing);
BackgroundJobEnqueueRetry<FinishComplete>(s => s.DoWork(leafInputId)); BackgroundJobEnqueueRetry<FinishComplete>(s => s.DoWork(leafInputId));
//try
//{
//}
//catch (PiscalClientException ex)
//{
// PiscalExceptionNotify(ex, leafInput);
//}
//catch (Exception ex)
//{
// var errorMessage = FormatException(ex, leafInput.Id);
// Logger.Error(errorMessage);
// DataService.SetLeafInputStatus(leafInput, LeafInputStatusType.Exception, ex.Message, errorMessage);
//}
break; break;
} }
} }