Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/SiteMonitor/ViewModels/MainWindowViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public string? SshPassword {
/// </summary>
private async Task OnRestart() {
using SshClient client = new(_serverAddress!, _sshUsername!, _sshPassword!);
await client.ConnectAsync(CancellationToken.None);
await client.ConnectAsync(CancellationToken.None).ConfigureAwait(false);
string command = "shutdown -r now";
using SshCommand? ssh = client.RunCommand($"echo {_sshPassword} | sudo -S {command}");
}
Expand All @@ -191,7 +191,7 @@ private async Task OnRestart() {
private async Task OnRestartImages() {
await Task.Run(async () => {
using SshClient client = new(_serverAddress!, _sshUsername!, _sshPassword!);
await client.ConnectAsync(CancellationToken.None);
await client.ConnectAsync(CancellationToken.None).ConfigureAwait(false);
string[] command = [
"docker compose -p nullinside-ui restart",
"docker compose -p nullinside-api restart",
Expand All @@ -202,7 +202,7 @@ await Task.Run(async () => {
foreach (string line in command) {
using SshCommand? ssh = client.RunCommand($"echo {_sshPassword} | sudo -S {line}");
}
});
}).ConfigureAwait(false);
}

/// <summary>
Expand All @@ -217,10 +217,10 @@ private void OnShowCommands() {
/// </summary>
private async Task PingSite() {
while (true) {
WebsiteUp = await SendHeadRequest("https://nullinside.com");
ApiUp = await SendHeadRequest("https://nullinside.com/api/v1/featureToggle");
NullUp = await SendHeadRequest("https://nullinside.com/null/v1/database/migration");
(HttpStatusCode, string?) chat = await SendGetRequest("https://nullinside.com/twitch-bot/v1/bot/chat/timestamp");
WebsiteUp = await SendHeadRequest("https://nullinside.com").ConfigureAwait(false);
ApiUp = await SendHeadRequest("https://nullinside.com/api/v1/featureToggle").ConfigureAwait(false);
NullUp = await SendHeadRequest("https://nullinside.com/null/v1/database/migration").ConfigureAwait(false);
(HttpStatusCode, string?) chat = await SendGetRequest("https://nullinside.com/twitch-bot/v1/bot/chat/timestamp").ConfigureAwait(false);
bool chatNotUpdating = false;
if (HttpStatusCode.OK == chat.Item1 && null != chat.Item2) {
ChatTimestamp = chat.Item2;
Expand All @@ -242,7 +242,7 @@ private async Task PingSite() {
WindowState = WindowState.Normal;
}

await Task.Delay(TimeSpan.FromSeconds(10));
await Task.Delay(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
}
}

Expand All @@ -258,7 +258,7 @@ private async Task<bool> SendHeadRequest(string address) {
using var httpClient = new HttpClient(handler);
using var request = new HttpRequestMessage(HttpMethod.Get, address);
request.Headers.TryAddWithoutValidation("user-agent", Nullinside.Api.Common.Constants.FAKE_USER_AGENT);
HttpResponseMessage response = await httpClient.SendAsync(request);
HttpResponseMessage response = await httpClient.SendAsync(request).ConfigureAwait(false);
return response.IsSuccessStatusCode;
}
catch {
Expand All @@ -278,8 +278,8 @@ private async Task<bool> SendHeadRequest(string address) {
using var httpClient = new HttpClient(handler);
using var request = new HttpRequestMessage(HttpMethod.Get, address);
request.Headers.TryAddWithoutValidation("user-agent", Nullinside.Api.Common.Constants.FAKE_USER_AGENT);
HttpResponseMessage response = await httpClient.SendAsync(request);
return (response.StatusCode, await response.Content.ReadAsStringAsync());
HttpResponseMessage response = await httpClient.SendAsync(request).ConfigureAwait(false);
return (response.StatusCode, await response.Content.ReadAsStringAsync().ConfigureAwait(false));
}
catch {
return (HttpStatusCode.InternalServerError, null);
Expand All @@ -299,7 +299,7 @@ private async Task PingServer() {
}
catch { }
finally {
await Task.Delay(TimeSpan.FromSeconds(10));
await Task.Delay(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/SiteMonitor/ViewModels/NewVersionWindowViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public NewVersionWindowViewModel() {
// asynchronously determine the current version number.
Task.Factory.StartNew(async () => {
GithubLatestReleaseJson? version =
await GitHubUpdateManager.GetLatestVersion("nullinside-development-group", "nullinside-site-monitor");
await GitHubUpdateManager.GetLatestVersion("nullinside-development-group", "nullinside-site-monitor").ConfigureAwait(false);

if (null == version) {
return;
Expand Down
4 changes: 2 additions & 2 deletions src/SiteMonitor/Views/MainWindow.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ protected override void OnInitialized() {
// check for a new version of the application.
Task.Factory.StartNew(async () => {
GithubLatestReleaseJson? serverVersion =
await GitHubUpdateManager.GetLatestVersion("nullinside-development-group", "nullinside-site-monitor");
await GitHubUpdateManager.GetLatestVersion("nullinside-development-group", "nullinside-site-monitor").ConfigureAwait(false);
if (null == serverVersion || string.IsNullOrWhiteSpace(serverVersion.name)) {
return;
}
Expand All @@ -90,7 +90,7 @@ protected override void OnInitialized() {
DataContext = vm
};

await versionWindow.ShowDialog(this);
await versionWindow.ShowDialog(this).ConfigureAwait(false);
}
catch {
// do nothing, don't crash
Expand Down
2 changes: 1 addition & 1 deletion src/nullinside-api
Submodule nullinside-api updated 22 files
+1 −1 src/Nullinside.Api.Common.AspNetCore/Middleware/BasicAuthenticationHandler.cs
+3 −1 src/Nullinside.Api.Common.AspNetCore/Nullinside.Api.Common.AspNetCore.csproj.DotSettings
+7 −7 src/Nullinside.Api.Common/Docker/DockerProxy.cs
+2 −2 src/Nullinside.Api.Common/Extensions/WebSocketExtensions.cs
+3 −1 src/Nullinside.Api.Common/Nullinside.Api.Common.csproj.DotSettings
+2 −2 src/Nullinside.Api.Common/Retry.cs
+21 −21 src/Nullinside.Api.Common/Twitch/TwitchApiProxy.cs
+7 −7 src/Nullinside.Api.Common/Twitch/TwitchClientProxy.cs
+3 −1 src/Nullinside.Api.Model/Nullinside.Api.Model.csproj.DotSettings
+3 −3 src/Nullinside.Api.Model/Shared/DatabaseLock.cs
+5 −5 src/Nullinside.Api.Model/Shared/UserHelpers.cs
+5 −5 src/Nullinside.Api.Tests/Nullinside.Api.Model/Shared/UserHelpersTests.cs
+3 −1 src/Nullinside.Api.Tests/Nullinside.Api.Tests.csproj.DotSettings
+8 −8 src/Nullinside.Api.Tests/Nullinside.Api/Controllers/DockerControllerTests.cs
+2 −2 src/Nullinside.Api.Tests/Nullinside.Api/Controllers/FeatureToggleControllerTests.cs
+15 −15 src/Nullinside.Api.Tests/Nullinside.Api/Controllers/UserControllerTests.cs
+1 −1 src/Nullinside.Api.Tests/UnitTestBase.cs
+1 −1 src/Nullinside.Api/Controllers/DatabaseController.cs
+4 −4 src/Nullinside.Api/Controllers/DockerController.cs
+1 −1 src/Nullinside.Api/Controllers/FeatureToggleController.cs
+14 −15 src/Nullinside.Api/Controllers/UserController.cs
+3 −1 src/Nullinside.Api/Nullinside.Api.csproj.DotSettings