dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

remove unnecessary cron

Browse Source
This commit is contained in:
ayntk-ai
2024-08-14 21:53:03 +02:00
parent 53bcf81af5
commit 8aa161d530
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Jobs/DockerCleanupJob.php
View File

@@ -12,7 +12,6 @@ use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use Cron\CronExpression;
class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue
{ {
@@ -22,23 +21,18 @@ class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue
public int|string|null $usageBefore = null; public int|string|null $usageBefore = null;
public function __construct(public Server $server) public function __construct(public Server $server) {}
{
}
public function handle(): void public function handle(): void
{ {
try { try {
if (!$this->server->isFunctional()) { if (! $this->server->isFunctional()) {
return; return;
} }
if ($this->server->settings->force_server_cleanup) { if ($this->server->settings->is_force_cleanup_enabled) {
$cronExpression = $this->server->settings->server_cleanup_frequency;
$cron = new CronExpression($cronExpression);
if ($cron->isDue()) {
Log::info('DockerCleanupJob force cleanup on ' . $this->server->name); Log::info('DockerCleanupJob force cleanup on ' . $this->server->name);
CleanupDocker::run(server: $this->server, force: true); CleanupDocker::run(server: $this->server, force: true);
}
return; return;
} }
@@ -49,7 +43,7 @@ class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue
return; return;
} }
if ($this->usageBefore >= $this->server->settings->server_cleanup_threshold) { if ($this->usageBefore >= $this->server->settings->cleanup_after_percentage) {
CleanupDocker::run(server: $this->server, force: false); CleanupDocker::run(server: $this->server, force: false);
$usageAfter = $this->server->getDiskUsage(); $usageAfter = $this->server->getDiskUsage();
if ($usageAfter < $this->usageBefore) { if ($usageAfter < $this->usageBefore) {