Merge pull request #5149 from coollabsio/next

v4.0.0-beta.393

app/Console/Kernel.php

@@ -6,13 +6,11 @@ use App\Jobs\CheckAndStartSentinelJob;
 use App\Jobs\CheckForUpdatesJob;
 use App\Jobs\CheckHelperImageJob;
 use App\Jobs\CleanupInstanceStuffsJob;
-use App\Jobs\CleanupStaleMultiplexedConnections;
 use App\Jobs\DatabaseBackupJob;
 use App\Jobs\DockerCleanupJob;
 use App\Jobs\PullTemplatesFromCDN;
 use App\Jobs\ScheduledTaskJob;
 use App\Jobs\ServerCheckJob;
-use App\Jobs\ServerCleanupMux;
 use App\Jobs\ServerStorageCheckJob;
 use App\Jobs\UpdateCoolifyJob;
 use App\Models\InstanceSettings;
@@ -23,6 +21,7 @@ use App\Models\Team;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Log;
 
 class Kernel extends ConsoleKernel
 {
@@ -99,11 +98,15 @@ class Kernel extends ConsoleKernel
             $servers = $this->allServers->whereRelation('settings', 'is_usable', true)->whereRelation('settings', 'is_reachable', true)->get();
         }
         foreach ($servers as $server) {
+            try {
                 if ($server->isSentinelEnabled()) {
                     $this->scheduleInstance->job(function () use ($server) {
                         CheckAndStartSentinelJob::dispatch($server);
                     })->cron($this->updateCheckFrequency)->timezone($this->instanceTimezone)->onOneServer();
                 }
+            } catch (\Exception $e) {
+                Log::error('Error pulling images: '.$e->getMessage());
+            }
         }
         $this->scheduleInstance->job(new CheckHelperImageJob)
             ->cron($this->updateCheckFrequency)
@@ -138,6 +141,7 @@ class Kernel extends ConsoleKernel
         }
 
         foreach ($servers as $server) {
+            try {
                 $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
                 if (validate_timezone($serverTimezone) === false) {
                     $serverTimezone = config('app.timezone');
@@ -154,10 +158,18 @@ class Kernel extends ConsoleKernel
                     }
                     // $this->scheduleInstance->job(new \App\Jobs\ServerCheckNewJob($server))->everyFiveMinutes()->onOneServer();
 
-                $this->scheduleInstance->job(new ServerStorageCheckJob($server))->cron($server->settings->server_disk_usage_check_frequency)->timezone($serverTimezone)->onOneServer();
+                    $serverDiskUsageCheckFrequency = data_get($server->settings, 'server_disk_usage_check_frequency', '0 * * * *');
+                    if (isset(VALID_CRON_STRINGS[$serverDiskUsageCheckFrequency])) {
+                        $serverDiskUsageCheckFrequency = VALID_CRON_STRINGS[$serverDiskUsageCheckFrequency];
+                    }
+                    $this->scheduleInstance->job(new ServerStorageCheckJob($server))->cron($serverDiskUsageCheckFrequency)->timezone($serverTimezone)->onOneServer();
                 }
 
-            $this->scheduleInstance->job(new DockerCleanupJob($server))->cron($server->settings->docker_cleanup_frequency)->timezone($serverTimezone)->onOneServer();
+                $dockerCleanupFrequency = data_get($server->settings, 'docker_cleanup_frequency', '0 * * * *');
+                if (isset(VALID_CRON_STRINGS[$dockerCleanupFrequency])) {
+                    $dockerCleanupFrequency = VALID_CRON_STRINGS[$dockerCleanupFrequency];
+                }
+                $this->scheduleInstance->job(new DockerCleanupJob($server))->cron($dockerCleanupFrequency)->timezone($serverTimezone)->onOneServer();
 
                 // Cleanup multiplexed connections every hour
                 // $this->scheduleInstance->job(new ServerCleanupMux($server))->hourly()->onOneServer();
@@ -168,6 +180,9 @@ class Kernel extends ConsoleKernel
                         $server->restartContainer('coolify-sentinel');
                     })->daily()->onOneServer();
                 }
+            } catch (\Exception $e) {
+                Log::error('Error checking resources: '.$e->getMessage());
+            }
         }
     }
 
@@ -200,10 +215,10 @@ class Kernel extends ConsoleKernel
         }
 
         foreach ($finalScheduledBackups as $scheduled_backup) {
+            try {
                 if (isset(VALID_CRON_STRINGS[$scheduled_backup->frequency])) {
                     $scheduled_backup->frequency = VALID_CRON_STRINGS[$scheduled_backup->frequency];
                 }
-
                 $server = $scheduled_backup->server();
                 $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
 
@@ -218,6 +233,10 @@ class Kernel extends ConsoleKernel
                 $this->scheduleInstance->job(new DatabaseBackupJob(
                     backup: $scheduled_backup
                 ))->cron($scheduled_backup->frequency)->timezone($serverTimezone)->onOneServer();
+            } catch (\Exception $e) {
+                Log::error('Error scheduling backup: '.$e->getMessage());
+                Log::error($e->getTraceAsString());
+            }
         }
     }
 
@@ -264,6 +283,7 @@ class Kernel extends ConsoleKernel
         }
 
         foreach ($finalScheduledTasks as $scheduled_task) {
+            try {
                 $server = $scheduled_task->server();
                 if (isset(VALID_CRON_STRINGS[$scheduled_task->frequency])) {
                     $scheduled_task->frequency = VALID_CRON_STRINGS[$scheduled_task->frequency];
@@ -276,6 +296,10 @@ class Kernel extends ConsoleKernel
                 $this->scheduleInstance->job(new ScheduledTaskJob(
                     task: $scheduled_task
                 ))->cron($scheduled_task->frequency)->timezone($serverTimezone)->onOneServer();
+            } catch (\Exception $e) {
+                Log::error('Error scheduling task: '.$e->getMessage());
+                Log::error($e->getTraceAsString());
+            }
         }
     }
 

config/constants.php

@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.392',
+        'version' => '4.0.0-beta.393',
         'helper_version' => '1.0.6',
         'realtime_version' => '1.0.5',
         'self_hosted' => env('SELF_HOSTED', true),

versions.json

@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.392"
+            "version": "4.0.0-beta.393"
         },
         "nightly": {
-            "version": "4.0.0-beta.393"
+            "version": "4.0.0-beta.394"
         },
         "helper": {
             "version": "1.0.6"