diff --git a/src/CncService/Impl/DashboardService.cs b/src/CncService/Impl/DashboardService.cs index 78e346f..9258443 100644 --- a/src/CncService/Impl/DashboardService.cs +++ b/src/CncService/Impl/DashboardService.cs @@ -73,13 +73,8 @@ namespace CncService.Impl public object GetCollectorStatus() { var latest = _collectorHeartbeatRepository.GetLatest("collector-service"); - bool isRunning = latest != null && latest.LastCollectTime.HasValue && - (DateTime.Now - latest.LastCollectTime.Value).TotalMinutes < 5; - long uptimeSeconds = 0; - if (isRunning && latest != null) - { - uptimeSeconds = latest.UptimeSeconds ?? 0; - } + bool isRunning = latest != null && latest.Status == "running"; + long uptimeSeconds = isRunning ? (latest.UptimeSeconds ?? 0) : 0; return new { status = isRunning ? "running" : "stopped", uptimeSeconds, lastCollectTime = latest?.LastCollectTime }; } }