tiennm99/coolify
1
0
Fork 0
mirror of https://github.com/tiennm99/coolify.git synced 2026-04-17 19:21:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(tests): add comprehensive tests for ContainerStatusAggregator and serverStatus accessor

Browse Source 
- Introduced tests for ContainerStatusAggregator to validate status aggregation logic across various container states.
- Implemented tests to ensure serverStatus accessor correctly checks server infrastructure health without being affected by container status.
- Updated ExcludeFromHealthCheckTest to verify excluded status handling in various components.
- Removed obsolete PushServerUpdateJobStatusAggregationTest as its functionality is covered elsewhere.
- Updated version number for sentinel to 0.0.17 in versions.json.
This commit is contained in:
Andras Bacsai
2025-11-20 17:31:07 +01:00
parent 70fb4c6869
commit ae6eef3cdb
23 changed files with 1590 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/Models/Application.php
View File

@@ -12,7 +12,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use OpenApi\Attributes as OA;
@@ -670,21 +669,23 @@ class Application extends BaseModel
{
return Attribute::make(
get: function () {
if (! $this->relationLoaded('additional_servers') || $this->additional_servers->count() === 0) {
return $this->destination?->server?->isFunctional() ?? false;
// Check main server infrastructure health
$main_server_functional = $this->destination?->server?->isFunctional() ?? false;
if (! $main_server_functional) {
return false;
}
$additional_servers_status = $this->additional_servers->pluck('pivot.status');
$main_server_status = $this->destination?->server?->isFunctional() ?? false;
foreach ($additional_servers_status as $status) {
$server_status = str($status)->before(':')->value();
if ($server_status !== 'running') {
return false;
// Check additional servers infrastructure health (not container status!)
if ($this->relationLoaded('additional_servers') && $this->additional_servers->count() > 0) {
foreach ($this->additional_servers as $server) {
if (! $server->isFunctional()) {
return false; // Real server infrastructure problem
}
}
}
return $main_server_status;
return true;
}
);
}
@@ -703,13 +704,6 @@ class Application extends BaseModel
} else {
$status = $value;
$health = 'unhealthy';
Log::debug('[STATUS-DEBUG] Status set without health - defaulting to unhealthy', [
'source' => 'Application model accessor',
'app_id' => $this->id,
'app_name' => $this->name,
'raw_value' => $value,
'result' => "$status:$health",
]);
}
return "$status:$health";
@@ -723,13 +717,6 @@ class Application extends BaseModel
} else {
$status = $value;
$health = 'unhealthy';
Log::debug('[STATUS-DEBUG] Status set without health (multi-server) - defaulting to unhealthy', [
'source' => 'Application model accessor',
'app_id' => $this->id,
'app_name' => $this->name,
'raw_value' => $value,
'result' => "$status:$health",
]);
}
return "$status:$health";