Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #5576 from W6HBR/dev

Browse Source 
fix job status issue for disabled jobs
This commit is contained in:
Shaun Walker
2025-09-05 11:07:52 -04:00
committed by GitHub
parent 8fd67621ac b7bc527d6c
commit c698188901
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Oqtane.Client/Modules/Admin/Jobs/Index.razor
View File

@ -114,18 +114,26 @@ else
private async Task StartJob(int jobId) private async Task StartJob(int jobId)
{ {
try Job _job = await JobService.GetJobAsync(jobId);
if (!_job.IsEnabled)
{ {
await JobService.StartJobAsync(jobId); AddModuleMessage(Localizer["Message.Job.Disabled"], MessageType.Warning);
await logger.LogInformation("Job Started {JobId}", jobId);
AddModuleMessage(Localizer["Message.Job.Start"], MessageType.Success);
_jobs = await JobService.GetJobsAsync();
StateHasChanged();
} }
catch (Exception ex) else
{ {
await logger.LogError(ex, "Error Starting Job {JobId} {Error}", jobId, ex.Message); try
AddModuleMessage(Localizer["Error.Job.Start"], MessageType.Error); {
await JobService.StartJobAsync(jobId);
await logger.LogInformation("Job Started {JobId}", jobId);
AddModuleMessage(Localizer["Message.Job.Start"], MessageType.Success);
_jobs = await JobService.GetJobsAsync();
StateHasChanged();
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Starting Job {JobId} {Error}", jobId, ex.Message);
AddModuleMessage(Localizer["Error.Job.Start"], MessageType.Error);
}
} }
} }

5
Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx
View File

@ -183,4 +183,7 @@
<data name="Refresh.Text" xml:space="preserve"> <data name="Refresh.Text" xml:space="preserve">
<value>Refresh</value> <value>Refresh</value>
</data> </data>
</root> <data name="Message.Job.Disabled" xml:space="preserve">
<value>The job cannot be started while in the disabled state.</value>
</data>
</root>

4
Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs
View File

@ -252,8 +252,8 @@ namespace Oqtane.Infrastructure
Job job = jobs.GetJobs().Where(item => item.JobType == jobTypeName).FirstOrDefault(); Job job = jobs.GetJobs().Where(item => item.JobType == jobTypeName).FirstOrDefault();
if (job != null) if (job != null)
{ {
// reset in case this job was forcefully terminated previously // reset in case this job was enabled and forcefully terminated previously
job.IsStarted = true; job.IsStarted = job.IsEnabled;
job.IsExecuting = false; job.IsExecuting = false;
jobs.UpdateJob(job); jobs.UpdateJob(job);
} }