Fixes --ECL

sillsdev · Sep 6, 2023 · 166e46c · 166e46c
1 parent 51214aa
commit 166e46c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/src/SIL.Machine.AspNetCore/Services/ClearMLAuthenticationService.cs b/src/SIL.Machine.AspNetCore/Services/ClearMLAuthenticationService.cs
@@ -37,11 +37,6 @@ public async Task<string> GetAuthTokenAsync(CancellationToken cancellationToken
         return _authToken;
     }
 
-    public override async Task StartAsync(CancellationToken cancellationToken)
-    {
-        await base.StartAsync(cancellationToken);
-    }
-
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
         _logger.LogInformation("ClearML Authentication Token Refresh service running - and has initial token.");
@@ -50,7 +45,8 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             while (!stoppingToken.IsCancellationRequested)
             {
                 await Task.Delay(TimeSpan.FromSeconds(RefreshPeriod), stoppingToken);
-                await AuthorizeAsync(stoppingToken);
+                using (await _lock.LockAsync())
+                    await AuthorizeAsync(stoppingToken);
             }
         }
         catch (TaskCanceledException) { }

diff --git a/src/SIL.Machine.AspNetCore/Services/ClearMLHealthCheck.cs b/src/SIL.Machine.AspNetCore/Services/ClearMLHealthCheck.cs
@@ -1,12 +1,10 @@
 public class ClearMLHealthCheck : IHealthCheck
 {
     private readonly IClearMLService _clearMLService;
-    private readonly ILogger _logger;
 
-    public ClearMLHealthCheck(IClearMLService clearMLService, ILoggerFactory loggerFactory)
+    public ClearMLHealthCheck(IClearMLService clearMLService)
     {
         _clearMLService = clearMLService;
-        _logger = loggerFactory.CreateLogger<ClearMLHealthCheck>();
     }
 
     public async Task<HealthCheckResult> CheckHealthAsync(
@@ -26,7 +24,6 @@ public async Task<HealthCheckResult> CheckHealthAsync(
         }
         catch (Exception e)
         {
-            _logger.LogError(e, null);
             return HealthCheckResult.Unhealthy(exception: e);
         }
     }

diff --git a/tests/SIL.Machine.AspNetCore.Tests/Services/ClearMLServiceTests.cs b/tests/SIL.Machine.AspNetCore.Tests/Services/ClearMLServiceTests.cs
@@ -28,7 +28,7 @@ public async Task CreateTaskAsync()
             }
         );
         var authService = Substitute.For<IClearMLAuthenticationService>();
-        authService.GetAuthTokenAsync().Returns("accessToken");
+        authService.GetAuthTokenAsync().Returns(Task.FromResult("accessToken"));
         var service = new ClearMLService(
             mockHttp.ToHttpClient(),
             options,