Watcher/watcher
4
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

feature/db-check #21

Merged
triggermeelmo merged 8 commits from feature/db-check into development 2025-10-03 13:11:18 +02:00
Conversation 0 Commits 8 Files Changed 11 +31 -7
4 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 69dd73a079 - Show all commits

6
Watcher/Controllers/HomeController.cs
View File

@@ -59,7 +59,8 @@ namespace Watcher.Controllers
Containers = await _context.Containers Containers = await _context.Containers
.OrderBy(s => s.Name) .OrderBy(s => s.Name)
.ToListAsync(), .ToListAsync(),
NetworkStatus = _DashboardStore.NetworkStatus NetworkStatus = _DashboardStore.NetworkStatus,
DatabaseStatus = _DashboardStore.DatabaseStatus
}; };
//ViewBag.NetworkConnection = _NetworkCheckStore.NetworkStatus; //ViewBag.NetworkConnection = _NetworkCheckStore.NetworkStatus;
return View(viewModel); return View(viewModel);
@@ -92,7 +93,8 @@ namespace Watcher.Controllers
Containers = await _context.Containers Containers = await _context.Containers
.OrderBy(s => s.Name) .OrderBy(s => s.Name)
.ToListAsync(), .ToListAsync(),
NetworkStatus = _DashboardStore.NetworkStatus NetworkStatus = _DashboardStore.NetworkStatus,
DatabaseStatus = _DashboardStore.DatabaseStatus
}; };
return PartialView("_DashboardStats", model); return PartialView("_DashboardStats", model);

2
Watcher/Services/DatabaseCheck.cs
View File

@@ -16,7 +16,7 @@ public class DatabaseCheck : BackgroundService
protected override async Task ExecuteAsync(CancellationToken stoppingToken) protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{ {
var timer = new PeriodicTimer(TimeSpan.FromSeconds(1800)); var timer = new PeriodicTimer(TimeSpan.FromSeconds(30));
while (await timer.WaitForNextTickAsync(stoppingToken)) while (await timer.WaitForNextTickAsync(stoppingToken))
{ {

1
Watcher/ViewModels/DashboardViewModel.cs
View File

@@ -15,6 +15,7 @@ namespace Watcher.ViewModels
public List<Container> Containers { get; set; } = new(); public List<Container> Containers { get; set; } = new();
public String? NetworkStatus { get; set; } = "?"; public String? NetworkStatus { get; set; } = "?";
public String? DatabaseStatus { get; set; } = "?";
} }
} }

29
Watcher/Views/Home/_DashboardStats.cshtml
View File

@@ -81,10 +81,31 @@
} }
} }
<div class="d-flex justify-content-between align-items-center mb-2"> @if (!Model.DatabaseStatus.IsNullOrEmpty())
<span>Datenbank</span> {
<span class="badge bg-success">OK</span> @if (Model.DatabaseStatus == "$ok")
</div> {
<div class="d-flex justify-content-between align-items-center mb-2">
<span>Datenbank</span>
<span class="badge bg-success">OK</span>
</div>
} else
{
<div class="d-flex justify-content-between align-items-center mb-2">
<span>Datenbank</span>
<span class="badge bg-danger">Big Problem</span>
</div>
}
} else
{
<div class="d-flex justify-content-between align-items-center mb-2">
<span>Datenbank</span>
<span class="badge bg-primary">Missing Data</span>
</div>
}
<div class="progress mb-3" style="height: 6px;"> <div class="progress mb-3" style="height: 6px;">
<div class="progress-bar bg-success w-100"></div> <div class="progress-bar bg-success w-100"></div>
</div> </div>