From 27b0c02ba918af9795a3e79c392e426f4a021953 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 1 Nov 2024 23:41:23 +0100
Subject: [PATCH] Refactor cleanup:database command signature to include
 optional --keep-days parameter

---
 app/Console/Kernel.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index cd560eee3..e17af3c8a 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -28,7 +28,7 @@ class Kernel extends ConsoleKernel
 
     protected function schedule(Schedule $schedule): void
     {
-        $this->allServers = Server::all();
+        $this->allServers = Server::query()->whereRelation('settings', 'is_usable', true)->whereRelation('settings', 'is_reachable', true)->where('ip', '!=', '1.2.3.4')->get();
         $settings = instanceSettings();
 
         $schedule->job(new CleanupStaleMultiplexedConnections)->hourly();
@@ -68,8 +68,7 @@ class Kernel extends ConsoleKernel
     private function pullImages($schedule): void
     {
         $settings = instanceSettings();
-        $servers = $this->allServers->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4');
-        foreach ($servers as $server) {
+        foreach ($this->allServers as $server) {
             if ($server->isSentinelEnabled()) {
                 $schedule->job(function () use ($server) {
                     CheckAndStartSentinelJob::dispatch($server);
@@ -104,11 +103,11 @@ class Kernel extends ConsoleKernel
     private function checkResources($schedule): void
     {
         if (isCloud()) {
-            $servers = $this->allServers->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);
             $own = Team::find(0)->servers;
             $servers = $servers->merge($own);
         } else {
-            $servers = $this->allServers->where('ip', '!=', '1.2.3.4');
+            $servers = $this->allServers;
         }
         foreach ($servers as $server) {
             $lastSentinelUpdate = $server->sentinel_updated_at;