From e4c3d61b76a8a9b4d67456b3429246db3724bc52 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 7 Aug 2024 09:50:29 +0200
Subject: [PATCH] fixes

---
 app/Console/Commands/CleanupDatabase.php |  1 +
 app/Console/Kernel.php                   | 12 ++++++------
 app/Jobs/PullTemplatesFromCDN.php        | 19 ++++++++++---------
 bootstrap/helpers/shared.php             |  2 +-
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/Console/Commands/CleanupDatabase.php b/app/Console/Commands/CleanupDatabase.php
index 07bc4d338..6f130626b 100644
--- a/app/Console/Commands/CleanupDatabase.php
+++ b/app/Console/Commands/CleanupDatabase.php
@@ -19,6 +19,7 @@ class CleanupDatabase extends Command
             echo "Running database cleanup in dry-run mode...\n";
         }
         if (isCloud()) {
+            // Later on we can increase this to 180 days or dynamically set
             $keep_days = 60;
         } else {
             $keep_days = 60;
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 3733917c1..bdf1ab042 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -34,24 +34,24 @@ class Kernel extends ConsoleKernel
             // Instance Jobs
             $schedule->command('horizon:snapshot')->everyMinute();
             $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
-            $schedule->job(new PullTemplatesFromCDN)->cron($settings->update_check_frequency)->onOneServer();
+
             // Server Jobs
             $this->check_scheduled_backups($schedule);
-            $this->checkResourcesNew($schedule);
+            $this->check_resources($schedule);
             $this->check_scheduled_tasks($schedule);
             $schedule->command('uploads:clear')->everyTwoMinutes();
         } else {
             // Instance Jobs
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
             $schedule->command('cleanup:unreachable-servers')->daily();
-            $this->scheduleUpdates($schedule);
             $schedule->job(new PullCoolifyImageJob)->cron($settings->update_check_frequency)->onOneServer();
             $schedule->job(new PullTemplatesFromCDN)->cron($settings->update_check_frequency)->onOneServer();
             $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
+            $this->schedule_updates($schedule);
 
             // Server Jobs
             $this->check_scheduled_backups($schedule);
-            $this->checkResourcesNew($schedule);
+            $this->check_resources($schedule);
             $this->pull_images($schedule);
             $this->check_scheduled_tasks($schedule);
 
@@ -72,7 +72,7 @@ class Kernel extends ConsoleKernel
         }
     }
 
-    private function scheduleUpdates($schedule)
+    private function schedule_updates($schedule)
     {
         $settings = InstanceSettings::get();
 
@@ -85,7 +85,7 @@ class Kernel extends ConsoleKernel
         }
     }
 
-    private function checkResourcesNew($schedule)
+    private function check_resources($schedule)
     {
         if (isCloud()) {
             $servers = $this->all_servers->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4');
diff --git a/app/Jobs/PullTemplatesFromCDN.php b/app/Jobs/PullTemplatesFromCDN.php
index 396ff29f4..72c971033 100644
--- a/app/Jobs/PullTemplatesFromCDN.php
+++ b/app/Jobs/PullTemplatesFromCDN.php
@@ -22,15 +22,16 @@ class PullTemplatesFromCDN implements ShouldBeEncrypted, ShouldQueue
     public function handle(): void
     {
         try {
-            if (! isDev()) {
-                ray('PullTemplatesAndVersions service-templates');
-                $response = Http::retry(3, 1000)->get(config('constants.services.official'));
-                if ($response->successful()) {
-                    $services = $response->json();
-                    File::put(base_path('templates/service-templates.json'), json_encode($services));
-                } else {
-                    send_internal_notification('PullTemplatesAndVersions failed with: '.$response->status().' '.$response->body());
-                }
+            if (isDev() || isCloud()) {
+                return;
+            }
+            ray('PullTemplatesAndVersions service-templates');
+            $response = Http::retry(3, 1000)->get(config('constants.services.official'));
+            if ($response->successful()) {
+                $services = $response->json();
+                File::put(base_path('templates/service-templates.json'), json_encode($services));
+            } else {
+                send_internal_notification('PullTemplatesAndVersions failed with: '.$response->status().' '.$response->body());
             }
         } catch (\Throwable $e) {
             send_internal_notification('PullTemplatesAndVersions failed with: '.$e->getMessage());
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index b93d15b9a..525781a95 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -505,7 +505,7 @@ function get_service_templates(bool $force = false): Collection
 {
     if ($force) {
         try {
-            $response = Http::retry(3, 50)->get(config('constants.services.official'));
+            $response = Http::retry(3, 1000)->get(config('constants.services.official'));
             if ($response->failed()) {
                 return collect([]);
             }