Skip to content

Commit da4da3a

Browse files
committed
Engine: Log index rebuild progress and failures
Also make sure that we pass a HubContextProgressNotifier to IndexRebuildService.RebuildIndexAsync().
1 parent 1bf23c9 commit da4da3a

2 files changed

Lines changed: 15 additions & 22 deletions

File tree

Applications/Spark.Web.Shared/Hubs/HubContextProgressNotifier.cs

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66

77
using Microsoft.AspNetCore.SignalR;
8-
using Tasks = System.Threading.Tasks;
98
using Microsoft.Extensions.Logging;
109
using Spark.Engine.Service.FhirServiceExtensions;
10+
using System.Threading.Tasks;
1111

1212
namespace Spark.Web.Hubs;
1313

@@ -31,10 +31,20 @@ public HubContextProgressNotifier(
3131
_logger = logger;
3232
}
3333

34-
public async Tasks.Task SendProgressUpdate(int progress, string message)
34+
public Task ReportProgressAsync(int progress, string message)
3535
{
36-
_logger.LogInformation($"[{progress}%] {message}");
36+
_logger.LogInformation("[{Progress}%] {Message}", progress, message);
37+
return SendProgressUpdate(progress, message);
38+
}
39+
40+
public Task ReportErrorAsync(string message)
41+
{
42+
_logger.LogError("[{Progress}%] {Message}", _progress, message);
43+
return SendProgressUpdate(_progress, message);
44+
}
3745

46+
private Task SendProgressUpdate(int progress, string message)
47+
{
3848
_progress = progress;
3949

4050
var msg = new ProgressMessage
@@ -43,23 +53,6 @@ public async Tasks.Task SendProgressUpdate(int progress, string message)
4353
Progress = progress
4454
};
4555

46-
await _hubContext.Clients.All.SendAsync("UpdateProgress", msg);
47-
}
48-
49-
public async Tasks.Task Progress(string message)
50-
{
51-
await SendProgressUpdate(_progress, message);
52-
}
53-
54-
public async Tasks.Task ReportProgressAsync(int progress, string message)
55-
{
56-
await SendProgressUpdate(progress, message)
57-
.ConfigureAwait(false);
58-
}
59-
60-
public async Tasks.Task ReportErrorAsync(string message)
61-
{
62-
await Progress(message)
63-
.ConfigureAwait(false);
56+
return _hubContext.Clients.All.SendAsync("UpdateProgress", msg);
6457
}
6558
}

Applications/Spark.Web.Shared/Hubs/MaintenanceHub.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public async Task RebuildIndex()
8989
try
9090
{
9191
await _hubContext.Clients.All.SendAsync("UpdateProgress", "Rebuilding index...");
92-
await _indexRebuildService.RebuildIndexAsync();
92+
await _indexRebuildService.RebuildIndexAsync(new HubContextProgressNotifier(_hubContext, _logger));
9393
await _hubContext.Clients.All.SendAsync("UpdateProgress", "Index rebuilt!");
9494
}
9595
catch (Exception e)

0 commit comments

Comments
 (0)