diff --git a/app/Models/YnhServer.php b/app/Models/YnhServer.php index 6780cd6..5df5ac6 100644 --- a/app/Models/YnhServer.php +++ b/app/Models/YnhServer.php @@ -156,13 +156,12 @@ public function status(): ServerStatusEnum } // Check if status is running - $minDate = Carbon::today()->subMinutes(10); + $minDate = Carbon::now()->subMinutes(10); $isRunning = collect(DB::select(" - SELECT COUNT(*) AS count - FROM ynh_osquery - WHERE ynh_server_id = {$this->id} - -- AND name IN ('memory_available_snapshot', 'disk_available_snapshot') - AND calendar_time >= '{$minDate->toDateTimeString()}' + SELECT COUNT(id) AS count + FROM ynh_osquery + WHERE ynh_server_id = {$this->id} + AND calendar_time >= '{$minDate->toDateTimeString()}' "))->first(); if ($isRunning->count > 0) { @@ -173,11 +172,10 @@ public function status(): ServerStatusEnum // Check if status is unknown $minDate = $minDate->subMinutes(10); $isUnknown = collect(DB::select(" - SELECT COUNT(*) AS count - FROM ynh_osquery - WHERE ynh_server_id = {$this->id} - -- AND name IN ('memory_available_snapshot', 'disk_available_snapshot') - AND calendar_time >= '{$minDate->toDateTimeString()}' + SELECT COUNT(id) AS count + FROM ynh_osquery + WHERE ynh_server_id = {$this->id} + AND calendar_time >= '{$minDate->toDateTimeString()}' "))->first(); if ($isUnknown->count > 0) { diff --git a/resources/views/home/cards/_towerify_domains.blade.php b/resources/views/home/cards/_towerify_domains.blade.php index 85612d2..3eab338 100644 --- a/resources/views/home/cards/_towerify_domains.blade.php +++ b/resources/views/home/cards/_towerify_domains.blade.php @@ -60,6 +60,4 @@ @endif - @endif \ No newline at end of file