glax/Tranga
1
0
Fork 0
mirror of https://github.com/C9Glax/tranga.git synced 2025-04-15 12:53:17 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Option to disable/enable jobs

Browse Source
This commit is contained in:
Glax 2025-03-07 11:32:59 +01:00
parent bf332717a5
commit 5921e524a9
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
API/Controllers/JobController.cs
View File

@ -212,6 +212,7 @@ public class JobController(PgsqlContext context) : Controller
return NotFound(); return NotFound();
ret.RecurrenceMs = modifyJobRecord.RecurrenceMs ?? ret.RecurrenceMs; ret.RecurrenceMs = modifyJobRecord.RecurrenceMs ?? ret.RecurrenceMs;
ret.Enabled = modifyJobRecord.Enabled ?? ret.Enabled;
context.SaveChanges(); context.SaveChanges();
return new AcceptedResult(ret.JobId, ret); return new AcceptedResult(ret.JobId, ret);

2
API/ModifyJobRecord.cs
View File

@ -1,3 +1,3 @@
namespace API; namespace API;
public record ModifyJobRecord(ulong? RecurrenceMs); public record ModifyJobRecord(ulong? RecurrenceMs, bool? Enabled);

1
API/Schema/Jobs/Job.cs
View File

@ -26,6 +26,7 @@ public abstract class Job
[NotMapped] [NotMapped]
public DateTime NextExecution => LastExecution.AddMilliseconds(RecurrenceMs); public DateTime NextExecution => LastExecution.AddMilliseconds(RecurrenceMs);
public JobState state { get; internal set; } = JobState.Waiting; public JobState state { get; internal set; } = JobState.Waiting;
public bool Enabled { get; internal set; } = true;
public Job(string jobId, JobType jobType, ulong recurrenceMs, Job? parentJob = null, ICollection<Job>? dependsOnJobs = null) public Job(string jobId, JobType jobType, ulong recurrenceMs, Job? parentJob = null, ICollection<Job>? dependsOnJobs = null)
: this(jobId, jobType, recurrenceMs, parentJob?.JobId, dependsOnJobs?.Select(j => j.JobId).ToList()) : this(jobId, jobType, recurrenceMs, parentJob?.JobId, dependsOnJobs?.Select(j => j.JobId).ToList())

9
API/Tranga.cs
View File

@ -69,18 +69,21 @@ public static class Tranga
Log.Info(TRANGA); Log.Info(TRANGA);
while (true) while (true)
{ {
List<Job> completedJobs = context.Jobs.Where(j => j.state >= JobState.Completed && j.state < JobState.Failed).ToList(); List<Job> completedJobs = context.Jobs.Where(j => j.state >= JobState.Completed).ToList();
foreach (Job job in completedJobs) foreach (Job job in completedJobs)
if (job.RecurrenceMs <= 0) if (job.RecurrenceMs <= 0)
context.Jobs.Remove(job); context.Jobs.Remove(job);
else else
{ {
if (job.state >= JobState.Failed)
job.Enabled = false;
else
job.state = JobState.Waiting;
job.LastExecution = DateTime.UtcNow; job.LastExecution = DateTime.UtcNow;
job.state = JobState.Waiting;
context.Jobs.Update(job); context.Jobs.Update(job);
} }
List<Job> runJobs = context.Jobs.Where(j => j.state <= JobState.Running).ToList() List<Job> runJobs = context.Jobs.Where(j => j.state <= JobState.Running && j.Enabled == true).ToList()
.Where(j => j.NextExecution < DateTime.UtcNow).ToList(); .Where(j => j.NextExecution < DateTime.UtcNow).ToList();
foreach (Job job in runJobs) foreach (Job job in runJobs)
{ {