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

Refactor variable and function names for consistency

Browse Source
This commit is contained in:
Andras Bacsai
2024-10-25 11:40:59 +02:00
parent d26a0f194b
commit 254bae9dbd
1 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/Console/Kernel.php
View File

@@ -2,13 +2,13 @@
namespace App\Console; namespace App\Console;
use App\Jobs\CheckAndStartSentinelJob;
use App\Jobs\CheckForUpdatesJob; use App\Jobs\CheckForUpdatesJob;
use App\Jobs\CheckHelperImageJob; use App\Jobs\CheckHelperImageJob;
use App\Jobs\CleanupInstanceStuffsJob; use App\Jobs\CleanupInstanceStuffsJob;
use App\Jobs\CleanupStaleMultiplexedConnections; use App\Jobs\CleanupStaleMultiplexedConnections;
use App\Jobs\DatabaseBackupJob; use App\Jobs\DatabaseBackupJob;
use App\Jobs\DockerCleanupJob; use App\Jobs\DockerCleanupJob;
use App\Jobs\PullSentinelImageJob;
use App\Jobs\PullTemplatesFromCDN; use App\Jobs\PullTemplatesFromCDN;
use App\Jobs\ScheduledTaskJob; use App\Jobs\ScheduledTaskJob;
use App\Jobs\ServerCheckJob; use App\Jobs\ServerCheckJob;
@@ -23,11 +23,11 @@ use Illuminate\Support\Carbon;
class Kernel extends ConsoleKernel class Kernel extends ConsoleKernel
{ {
private $all_servers; private $allServers;
protected function schedule(Schedule $schedule): void protected function schedule(Schedule $schedule): void
{ {
$this->all_servers = Server::all(); $this->allServers = Server::all();
$settings = instanceSettings(); $settings = instanceSettings();
$schedule->job(new CleanupStaleMultiplexedConnections)->hourly(); $schedule->job(new CleanupStaleMultiplexedConnections)->hourly();
@@ -37,9 +37,9 @@ class Kernel extends ConsoleKernel
$schedule->command('horizon:snapshot')->everyMinute(); $schedule->command('horizon:snapshot')->everyMinute();
$schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer(); $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
// Server Jobs // Server Jobs
$this->check_scheduled_backups($schedule); $this->checkScheduledBackups($schedule);
$this->check_resources($schedule); $this->checkResources($schedule);
$this->check_scheduled_tasks($schedule); $this->checkScheduledTasks($schedule);
$schedule->command('uploads:clear')->everyTwoMinutes(); $schedule->command('uploads:clear')->everyTwoMinutes();
$schedule->command('telescope:prune')->daily(); $schedule->command('telescope:prune')->daily();
@@ -51,32 +51,27 @@ class Kernel extends ConsoleKernel
$schedule->command('cleanup:unreachable-servers')->daily()->onOneServer(); $schedule->command('cleanup:unreachable-servers')->daily()->onOneServer();
$schedule->job(new PullTemplatesFromCDN)->cron($settings->update_check_frequency)->timezone($settings->instance_timezone)->onOneServer(); $schedule->job(new PullTemplatesFromCDN)->cron($settings->update_check_frequency)->timezone($settings->instance_timezone)->onOneServer();
$schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer(); $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
$this->schedule_updates($schedule); $this->scheduleUpdates($schedule);
// Server Jobs // Server Jobs
$this->check_scheduled_backups($schedule); $this->checkScheduledBackups($schedule);
$this->check_resources($schedule); $this->checkResources($schedule);
$this->pull_images($schedule); $this->pullImages($schedule);
$this->check_scheduled_tasks($schedule); $this->checkScheduledTasks($schedule);
$schedule->command('cleanup:database --yes')->daily(); $schedule->command('cleanup:database --yes')->daily();
$schedule->command('uploads:clear')->everyTwoMinutes(); $schedule->command('uploads:clear')->everyTwoMinutes();
} }
} }
private function pull_images($schedule) private function pullImages($schedule): void
{ {
$settings = instanceSettings(); $settings = instanceSettings();
$servers = $this->all_servers->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4'); $servers = $this->allServers->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4');
foreach ($servers as $server) { foreach ($servers as $server) {
if ($server->isSentinelEnabled()) { if ($server->isSentinelEnabled()) {
$schedule->job(function () use ($server) { $schedule->job(function () use ($server) {
$sentinel_found = instant_remote_process(['docker inspect coolify-sentinel'], $server, false); CheckAndStartSentinelJob::dispatch($server);
$sentinel_found = json_decode($sentinel_found, true);
$status = data_get($sentinel_found, '0.State.Status', 'exited');
if ($status !== 'running') {
PullSentinelImageJob::dispatch($server);
}
})->cron($settings->update_check_frequency)->timezone($settings->instance_timezone)->onOneServer(); })->cron($settings->update_check_frequency)->timezone($settings->instance_timezone)->onOneServer();
} }
} }
@@ -86,7 +81,7 @@ class Kernel extends ConsoleKernel
->onOneServer(); ->onOneServer();
} }
private function schedule_updates($schedule) private function scheduleUpdates($schedule): void
{ {
$settings = instanceSettings(); $settings = instanceSettings();
@@ -105,14 +100,14 @@ class Kernel extends ConsoleKernel
} }
} }
private function check_resources($schedule) private function checkResources($schedule): void
{ {
if (isCloud()) { if (isCloud()) {
$servers = $this->all_servers->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4'); $servers = $this->allServers->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4');
$own = Team::find(0)->servers; $own = Team::find(0)->servers;
$servers = $servers->merge($own); $servers = $servers->merge($own);
} else { } else {
$servers = $this->all_servers->where('ip', '!=', '1.2.3.4'); $servers = $this->allServers->where('ip', '!=', '1.2.3.4');
} }
foreach ($servers as $server) { foreach ($servers as $server) {
$last_sentinel_update = $server->sentinel_updated_at; $last_sentinel_update = $server->sentinel_updated_at;
@@ -128,7 +123,7 @@ class Kernel extends ConsoleKernel
} }
} }
private function check_scheduled_backups($schedule) private function checkScheduledBackups($schedule): void
{ {
$scheduled_backups = ScheduledDatabaseBackup::all(); $scheduled_backups = ScheduledDatabaseBackup::all();
if ($scheduled_backups->isEmpty()) { if ($scheduled_backups->isEmpty()) {
@@ -161,7 +156,7 @@ class Kernel extends ConsoleKernel
} }
} }
private function check_scheduled_tasks($schedule) private function checkScheduledTasks($schedule): void
{ {
$scheduled_tasks = ScheduledTask::all(); $scheduled_tasks = ScheduledTask::all();
if ($scheduled_tasks->isEmpty()) { if ($scheduled_tasks->isEmpty()) {