taiqane/UmlautAdaptarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Jonas F
2025-01-13 21:19:45 +01:00
committed by GitHub
parent dd6b4c9d3b 83905622cb
commit 5463794a4f
2 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UmlautAdaptarr/Utilities/ServicesExtensions.cs
View File

@@ -68,7 +68,7 @@ public static class ServicesExtensions
Console.WriteLine(($"Property {failure.PropertyName } failed validation. Error was: {failure.ErrorMessage}")); Console.WriteLine(($"Property {failure.PropertyName } failed validation. Error was: {failure.ErrorMessage}"));
} }
throw new Exception("Please fix your environment variables and then Start UmlautAdaptarr again"); throw new Exception("Please fix cour environment variables and then Start UmlautAdaptarr again");
} }
var instanceState = (bool)(typeof(TOptions).GetProperty("Enabled")?.GetValue(option, null) ?? false); var instanceState = (bool)(typeof(TOptions).GetProperty("Enabled")?.GetValue(option, null) ?? false);

59
UmlautAdaptarr/Validator/GlobalInstanceOptionsValidator.cs
View File

@@ -36,37 +36,36 @@ public class GlobalInstanceOptionsValidator : AbstractValidator<GlobalInstanceOp
&& (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps); && (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps);
} }
private static async Task<bool> BeReachable(GlobalInstanceOptions opts, CancellationToken cancellationToken) private static async Task<bool> BeReachable(GlobalInstanceOptions opts, CancellationToken cancellationToken)
{ {
var endTime = DateTime.Now.AddMinutes(3); var endTime = DateTime.Now.AddMinutes(3);
var reachable = false; var reachable = false;
var url = $"{opts.Host}/api?apikey={opts.ApiKey}"; var url = $"{opts.Host}/api?apikey={opts.ApiKey}";
while (DateTime.Now < endTime) while (DateTime.Now < endTime)
{ {
try try
{ {
using var response = await httpClient.GetAsync(url, cancellationToken); using var response = await httpClient.GetAsync(url, cancellationToken);
if (response.IsSuccessStatusCode) if (response.IsSuccessStatusCode)
{ {
reachable = true; reachable = true;
break; break;
} }
else else
{ {
Console.WriteLine($"Reachable check got unexpected status code {response.StatusCode}."); Console.WriteLine($"Reachable check got unexpected status code {response.StatusCode}.");
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine(ex.Message); Console.WriteLine(ex.Message);
} }
// Wait for 15 seconds for next try // Wait for 15 seconds for next try
Console.WriteLine($"The URL \"{opts.Host}/api?apikey=[REDACTED]\" is not reachable. Next attempt in 15 seconds..."); Console.WriteLine($"The URL \"{opts.Host}/api?apikey=[REDACTED]\" is not reachable. Next attempt in 15 seconds...");
Thread.Sleep(15000); Thread.Sleep(15000);
} }
return reachable; return reachable;
}
} }