Skip to content

Commit 4fbfe35

Browse files
authored
Improve remote worker logs from submissions controller (#1531)
Closes SoftUni-Internal/exam-systems-issues#1655
1 parent e0bf7ec commit 4fbfe35

File tree

1 file changed

+11
-18
lines changed

1 file changed

+11
-18
lines changed

Servers/Worker/OJS.Servers.Worker/Controllers/Api/SubmissionsController.cs

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using OJS.Services.Infrastructure.Exceptions;
1010
using OJS.Services.Worker.Business;
1111
using OJS.Services.Common.Models.Submissions.ExecutionContext;
12+
using OJS.Services.Infrastructure.Constants;
1213
using OJS.Services.Infrastructure.Extensions;
1314
using System;
1415
using System.Threading.Tasks;
@@ -18,12 +19,18 @@
1819
public class SubmissionsController : BaseApiController
1920
{
2021
private readonly ISubmissionsBusinessService submissionsBusiness;
21-
// private readonly ILogger<SubmissionsController> logger;
22+
private readonly ILogger<SubmissionsController> logger;
23+
private readonly IHostInfoService hostInfoService;
2224

2325
public SubmissionsController(
2426
ISubmissionsBusinessService submissionsBusiness,
25-
ILogger<SubmissionsController> logger) =>
27+
ILogger<SubmissionsController> logger,
28+
IHostInfoService hostInfoService)
29+
{
2630
this.submissionsBusiness = submissionsBusiness;
31+
this.logger = logger;
32+
this.hostInfoService = hostInfoService;
33+
}
2734

2835
[HttpPost]
2936
[ProducesResponseType(typeof(FullExecutionResultResponseModel), Status200OK)]
@@ -49,17 +56,6 @@ public async Task<IActionResult> ExecuteFileSubmission(
4956
submissionFileRequestModel.WithExceptionStackTrace)
5057
.ToOkResult();
5158

52-
// Dont think thats used anymore
53-
// [HttpPost]
54-
// [ProducesResponseType(typeof(FullExecutionResultResponseModel), Status200OK)]
55-
// public async Task<IActionResult> ExecuteFileSubmissionWithJson(
56-
// [ModelBinder(typeof(JsonWithFilesFormDataModelBinder), Name = "executionContextJson")]
57-
// SubmissionFileRequestModel submissionFileRequestModel)
58-
// => await this.ExecuteSubmission(
59-
// submissionFileRequestModel.Map<SubmissionServiceModel>(),
60-
// submissionFileRequestModel.WithExceptionStackTrace)
61-
// .ToOkResult();
62-
6359
private async Task<FullExecutionResultResponseModel> ExecuteSubmission(
6460
SubmissionServiceModel submission,
6561
bool withStackTrace)
@@ -74,13 +70,10 @@ private async Task<FullExecutionResultResponseModel> ExecuteSubmission(
7470

7571
result.SetExecutionResult(executionResultResponseModel);
7672
}
77-
catch (BusinessServiceException ex)
78-
{
79-
result.SetException(ex, false);
80-
}
8173
catch (Exception ex)
8274
{
83-
result.SetException(ex, withStackTrace);
75+
this.logger.LogErrorProcessingSubmission(submission.Id, this.hostInfoService.GetHostIp(), ex);
76+
result.SetException(ex, ex is not BusinessServiceException && withStackTrace);
8477
}
8578
finally
8679
{

0 commit comments

Comments
 (0)