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

Merge pull request #5211 from sbwalker/dev

Browse Source 
fix #5194 - improve performance of retrieving scheduled job logs
This commit is contained in:
Shaun Walker 2025-03-31 13:16:52 -04:00 committed by GitHub
commit c8286148c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Jobs/Edit.razor
View File

@ -45,7 +45,7 @@
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="retention" HelpText="Number of log entries to retain for this job" ResourceKey="RetentionLog">Retention Log (Items): </Label> <Label Class="col-sm-3" For="retention" HelpText="Number of log entries to retain for this job" ResourceKey="RetentionLog">Retention Log (Items): </Label>
<div class="col-sm-9"> <div class="col-sm-9">
<input id="retention" type="number" min="0" step ="1" class="form-control" @bind="@_retentionHistory" maxlength="4" required /> <input id="retention" type="number" min="0" step ="1" class="form-control" @bind="@_retentionHistory" maxlength="3" required />
</div> </div>
</div> </div>
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">

8
Oqtane.Client/Modules/Admin/Jobs/Log.razor
View File

@ -44,14 +44,12 @@ else
private async Task GetJobLogs() private async Task GetJobLogs()
{ {
_jobLogs = await JobLogService.GetJobLogsAsync(); var jobId = -1;
if (PageState.QueryString.ContainsKey("id")) if (PageState.QueryString.ContainsKey("id"))
{ {
_jobLogs = _jobLogs.Where(item => item.JobId == Int32.Parse(PageState.QueryString["id"])).ToList(); jobId = int.Parse(PageState.QueryString["id"]);
} }
_jobLogs = await JobLogService.GetJobLogsAsync(jobId);
_jobLogs = _jobLogs.OrderByDescending(item => item.JobLogId).ToList();
} }
private string DisplayStatus(bool isExecuting, bool? succeeded) private string DisplayStatus(bool isExecuting, bool? succeeded)

5
Oqtane.Client/Services/Interfaces/IJobLogService.cs
View File

@ -10,10 +10,11 @@ namespace Oqtane.Services
public interface IJobLogService public interface IJobLogService
{ {
/// <summary> /// <summary>
/// Return a list of all <see cref="JobLog"/> entries /// Return a list of <see cref="JobLog"/> entries
/// </summary> /// </summary>
/// <param name="jobId"></param>
/// <returns></returns> /// <returns></returns>
Task<List<JobLog>> GetJobLogsAsync(); Task<List<JobLog>> GetJobLogsAsync(int jobId);
/// <summary> /// <summary>
/// Return a <see cref="JobLog"/> entry for the given Id /// Return a <see cref="JobLog"/> entry for the given Id

5
Oqtane.Client/Services/JobLogService.cs
View File

@ -15,10 +15,9 @@ namespace Oqtane.Services
private string Apiurl => CreateApiUrl("JobLog"); private string Apiurl => CreateApiUrl("JobLog");
public async Task<List<JobLog>> GetJobLogsAsync() public async Task<List<JobLog>> GetJobLogsAsync(int jobId)
{ {
List<JobLog> joblogs = await GetJsonAsync<List<JobLog>>(Apiurl); return await GetJsonAsync<List<JobLog>>($"{Apiurl}?jobid={jobId}");
return joblogs.OrderBy(item => item.StartDate).ToList();
} }
public async Task<JobLog> GetJobLogAsync(int jobLogId) public async Task<JobLog> GetJobLogAsync(int jobLogId)

6
Oqtane.Server/Controllers/JobLogController.cs
View File

@ -17,12 +17,12 @@ namespace Oqtane.Controllers
_jobLogs = jobLogs; _jobLogs = jobLogs;
} }
// GET: api/<controller> // GET: api/<controller>?jobid=x
[HttpGet] [HttpGet]
[Authorize(Roles = RoleNames.Host)] [Authorize(Roles = RoleNames.Host)]
public IEnumerable<JobLog> Get() public IEnumerable<JobLog> Get(string jobid)
{ {
return _jobLogs.GetJobLogs(); return _jobLogs.GetJobLogs(int.Parse(jobid));
} }
// GET api/<controller>/5 // GET api/<controller>/5

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

@ -172,8 +172,7 @@ namespace Oqtane.Infrastructure
jobs.UpdateJob(job); jobs.UpdateJob(job);
// trim the job log // trim the job log
List<JobLog> logs = jobLogs.GetJobLogs().Where(item => item.JobId == job.JobId) List<JobLog> logs = jobLogs.GetJobLogs(job.JobId).ToList();
.OrderByDescending(item => item.JobLogId).ToList();
for (int i = logs.Count; i > job.RetentionHistory; i--) for (int i = logs.Count; i > job.RetentionHistory; i--)
{ {
jobLogs.DeleteJobLog(logs[i - 1].JobLogId); jobLogs.DeleteJobLog(logs[i - 1].JobLogId);

3
Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs
View File

@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using Oqtane.Models; using Oqtane.Models;
namespace Oqtane.Repository namespace Oqtane.Repository
@ -6,6 +6,7 @@ namespace Oqtane.Repository
public interface IJobLogRepository public interface IJobLogRepository
{ {
IEnumerable<JobLog> GetJobLogs(); IEnumerable<JobLog> GetJobLogs();
IEnumerable<JobLog> GetJobLogs(int jobId);
JobLog AddJobLog(JobLog jobLog); JobLog AddJobLog(JobLog jobLog);
JobLog UpdateJobLog(JobLog jobLog); JobLog UpdateJobLog(JobLog jobLog);
JobLog GetJobLog(int jobLogId); JobLog GetJobLog(int jobLogId);

10
Oqtane.Server/Repository/JobLogRepository.cs
View File

@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Oqtane.Models; using Oqtane.Models;
@ -15,9 +15,17 @@ namespace Oqtane.Repository
} }
public IEnumerable<JobLog> GetJobLogs() public IEnumerable<JobLog> GetJobLogs()
{
return GetJobLogs(-1);
}
public IEnumerable<JobLog> GetJobLogs(int jobId)
{ {
return _db.JobLog return _db.JobLog
.AsNoTracking()
.Where(item => item.JobId == jobId || jobId == -1)
.Include(item => item.Job) // eager load jobs .Include(item => item.Job) // eager load jobs
.OrderByDescending(item => item.JobLogId)
.ToList(); .ToList();
} }