rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(cleanup): preserve self-hosted server IPs (#10480)

Browse source
This commit is contained in:
Andras Bacsai 2026-05-31 21:50:28 +02:00 committed by GitHub
commit 8a52307255
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Console/Commands/CleanupUnreachableServers.php
View file

@ -18,9 +18,13 @@ public function handle()
if ($servers->count() > 0) { if ($servers->count() > 0) {
foreach ($servers as $server) { foreach ($servers as $server) {
echo "Cleanup unreachable server ($server->id) with name $server->name"; echo "Cleanup unreachable server ($server->id) with name $server->name";
$server->update([ if (isCloud()) {
'ip' => '1.2.3.4', $server->update([
]); 'ip' => '1.2.3.4',
]);
} else {
$server->forceDisableServer();
}
} }
} }
} }

28
tests/Feature/CleanupUnreachableServersTest.php
View file

@ -6,7 +6,30 @@
uses(RefreshDatabase::class); uses(RefreshDatabase::class);
it('cleans up servers with unreachable_count >= 3 after 7 days', function () { it('disables (non-destructively) self-hosted servers with unreachable_count >= 3 after 7 days', function () {
config(['constants.coolify.self_hosted' => true]);
$team = Team::factory()->create();
$server = Server::factory()->create([
'team_id' => $team->id,
'unreachable_count' => 50,
'unreachable_notification_sent' => true,
'updated_at' => now()->subDays(8),
]);
$originalIp = (string) $server->ip;
$this->artisan('cleanup:unreachable-servers')->assertSuccessful();
$server->refresh();
// IP must be preserved — never overwritten on self-hosted.
expect($server->ip)->toBe($originalIp);
expect($server->settings->force_disabled)->toBeTrue();
});
it('overwrites the IP with 1.2.3.4 on cloud for servers with unreachable_count >= 3 after 7 days', function () {
config(['constants.coolify.self_hosted' => false]);
$team = Team::factory()->create(); $team = Team::factory()->create();
$server = Server::factory()->create([ $server = Server::factory()->create([
'team_id' => $team->id, 'team_id' => $team->id,
@ -36,6 +59,7 @@
$server->refresh(); $server->refresh();
expect($server->ip)->toBe($originalIp); expect($server->ip)->toBe($originalIp);
expect($server->settings->force_disabled)->toBeFalse();
}); });
it('does not clean up servers updated within 7 days', function () { it('does not clean up servers updated within 7 days', function () {
@ -53,6 +77,7 @@
$server->refresh(); $server->refresh();
expect($server->ip)->toBe($originalIp); expect($server->ip)->toBe($originalIp);
expect($server->settings->force_disabled)->toBeFalse();
}); });
it('does not clean up servers without notification sent', function () { it('does not clean up servers without notification sent', function () {
@ -70,4 +95,5 @@
$server->refresh(); $server->refresh();
expect($server->ip)->toBe($originalIp); expect($server->ip)->toBe($originalIp);
expect($server->settings->force_disabled)->toBeFalse();
}); });