From 6131746180d9c3eee6cb34fe7485376a168b7bc3 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 16 May 2024 21:36:01 +0200 Subject: [PATCH] Add all_servers property to Kernel class for better code organization --- app/Console/Kernel.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 51e4cfc17..23289f90e 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -21,8 +21,10 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel; class Kernel extends ConsoleKernel { + private $all_servers; protected function schedule(Schedule $schedule): void { + $this->all_servers = Server::all(); if (isDev()) { // Instance Jobs $schedule->command('horizon:snapshot')->everyMinute(); @@ -56,7 +58,7 @@ class Kernel extends ConsoleKernel } private function pull_helper_image($schedule) { - $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4'); + $servers = $this->all_servers->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4'); foreach ($servers as $server) { if (config('coolify.is_sentinel_enabled')) { $schedule->job(new PullSentinelImageJob($server))->everyFiveMinutes()->onOneServer(); @@ -67,12 +69,12 @@ class Kernel extends ConsoleKernel private function check_resources($schedule) { if (isCloud()) { - $servers = Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4'); + $servers = $this->all_servers->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4'); $own = Team::find(0)->servers; $servers = $servers->merge($own); $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false); } else { - $servers = Server::all()->where('ip', '!=', '1.2.3.4'); + $servers = $this->all_servers->where('ip', '!=', '1.2.3.4'); $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false); } foreach ($containerServers as $server) {