Compare commits

..

No commits in common. "f5b6b1785f0870b99467437cba0f65f1628c9646" and "b149d377dc381bbb6da441e003d22e37399fa594" have entirely different histories.

2 changed files with 3 additions and 3 deletions

View File

@ -59,13 +59,13 @@ public abstract class Job : GlobalBase
public void ResetProgress() public void ResetProgress()
{ {
this.progressToken.increments -= progressToken.incrementsCompleted; this.progressToken.increments = this.progressToken.increments - this.progressToken.incrementsCompleted;
this.lastExecution = DateTime.Now; this.lastExecution = DateTime.Now;
} }
public void ExecutionEnqueue() public void ExecutionEnqueue()
{ {
this.progressToken.increments -= progressToken.incrementsCompleted; this.progressToken.increments = this.progressToken.increments - this.progressToken.incrementsCompleted;
this.lastExecution = recurrenceTime is not null ? DateTime.Now.Subtract((TimeSpan)recurrenceTime) : DateTime.UnixEpoch; this.lastExecution = recurrenceTime is not null ? DateTime.Now.Subtract((TimeSpan)recurrenceTime) : DateTime.UnixEpoch;
this.progressToken.Standby(); this.progressToken.Standby();
} }

View File

@ -223,7 +223,7 @@ public class JobBoss : GlobalBase
queueHead.ResetProgress(); queueHead.ResetProgress();
jobQueue.Dequeue(); jobQueue.Dequeue();
ExportJobsList(); ExportJobsList();
Log($"Next job in {jobs.MinBy(job => job.nextExecution)?.nextExecution.Subtract(DateTime.Now)} {jobs.MinBy(job => job.nextExecution)?.id}"); Log($"Next job in {jobs.OrderBy(job => job.nextExecution).First().nextExecution.Subtract(DateTime.Now)}");
}else if (queueHead.progressToken.state is ProgressToken.State.Standby) }else if (queueHead.progressToken.state is ProgressToken.State.Standby)
{ {
Job[] subJobs = jobQueue.Peek().ExecuteReturnSubTasks().ToArray(); Job[] subJobs = jobQueue.Peek().ExecuteReturnSubTasks().ToArray();