Merge pull request #6156 from coollabsio/next

v4.0.0-beta.420.5

app/Actions/Database/StartDatabaseProxy.php

@@ -47,6 +47,7 @@ class StartDatabaseProxy
         if ($isSSLEnabled) {
             $internalPort = match ($databaseType) {
                 'standalone-redis', 'standalone-keydb', 'standalone-dragonfly' => 6380,
+                default => $internalPort,
             };
         }
 

app/Console/Commands/RunScheduledJobsManually.php

@@ -0,0 +1,217 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Jobs\DatabaseBackupJob;
+use App\Jobs\ScheduledTaskJob;
+use App\Models\ScheduledDatabaseBackup;
+use App\Models\ScheduledTask;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
+
+class RunScheduledJobsManually extends Command
+{
+    protected $signature = 'schedule:run-manual 
+                           {--type=all : Type of jobs to run (all, backups, tasks)}
+                           {--chunk=5 : Number of jobs to process in each batch}
+                           {--delay=30 : Delay in seconds between batches}
+                           {--max= : Maximum number of jobs to process (useful for testing)}
+                           {--dry-run : Show what would be executed without actually running jobs}';
+
+    protected $description = 'Manually run scheduled database backups and tasks when cron fails';
+
+    public function handle()
+    {
+        $type = $this->option('type');
+        $chunkSize = (int) $this->option('chunk');
+        $delay = (int) $this->option('delay');
+        $maxJobs = $this->option('max') ? (int) $this->option('max') : null;
+        $dryRun = $this->option('dry-run');
+
+        $this->info('Starting manual execution of scheduled jobs...'.($dryRun ? ' (DRY RUN)' : ''));
+        $this->info("Type: {$type}, Chunk size: {$chunkSize}, Delay: {$delay}s".($maxJobs ? ", Max jobs: {$maxJobs}" : '').($dryRun ? ', Dry run: enabled' : ''));
+
+        if ($dryRun) {
+            $this->warn('DRY RUN MODE: No jobs will actually be dispatched');
+        }
+
+        if ($type === 'all' || $type === 'backups') {
+            $this->runScheduledBackups($chunkSize, $delay, $maxJobs, $dryRun);
+        }
+
+        if ($type === 'all' || $type === 'tasks') {
+            $this->runScheduledTasks($chunkSize, $delay, $maxJobs, $dryRun);
+        }
+
+        $this->info('Completed manual execution of scheduled jobs.'.($dryRun ? ' (DRY RUN)' : ''));
+    }
+
+    private function runScheduledBackups(int $chunkSize, int $delay, ?int $maxJobs = null, bool $dryRun = false): void
+    {
+        $this->info('Processing scheduled database backups...');
+
+        $scheduled_backups = ScheduledDatabaseBackup::where('enabled', true)->get();
+
+        if ($scheduled_backups->isEmpty()) {
+            $this->info('No enabled scheduled backups found.');
+
+            return;
+        }
+
+        $finalScheduledBackups = collect();
+
+        foreach ($scheduled_backups as $scheduled_backup) {
+            if (blank(data_get($scheduled_backup, 'database'))) {
+                $this->warn("Deleting backup {$scheduled_backup->id} - missing database");
+                $scheduled_backup->delete();
+
+                continue;
+            }
+
+            $server = $scheduled_backup->server();
+            if (blank($server)) {
+                $this->warn("Deleting backup {$scheduled_backup->id} - missing server");
+                $scheduled_backup->delete();
+
+                continue;
+            }
+
+            if ($server->isFunctional() === false) {
+                $this->warn("Skipping backup {$scheduled_backup->id} - server not functional");
+
+                continue;
+            }
+
+            if (isCloud() && data_get($server->team->subscription, 'stripe_invoice_paid', false) === false && $server->team->id !== 0) {
+                $this->warn("Skipping backup {$scheduled_backup->id} - subscription not paid");
+
+                continue;
+            }
+
+            $finalScheduledBackups->push($scheduled_backup);
+        }
+
+        if ($maxJobs && $finalScheduledBackups->count() > $maxJobs) {
+            $finalScheduledBackups = $finalScheduledBackups->take($maxJobs);
+            $this->info("Limited to {$maxJobs} scheduled backups for testing");
+        }
+
+        $this->info("Found {$finalScheduledBackups->count()} valid scheduled backups to process");
+
+        $chunks = $finalScheduledBackups->chunk($chunkSize);
+        foreach ($chunks as $index => $chunk) {
+            $this->info('Processing backup batch '.($index + 1).' of '.$chunks->count()." ({$chunk->count()} items)");
+
+            foreach ($chunk as $scheduled_backup) {
+                try {
+                    if ($dryRun) {
+                        $this->info("🔍 Would dispatch backup job for: {$scheduled_backup->name} (ID: {$scheduled_backup->id})");
+                    } else {
+                        DatabaseBackupJob::dispatch($scheduled_backup);
+                        $this->info("✓ Dispatched backup job for: {$scheduled_backup->name} (ID: {$scheduled_backup->id})");
+                    }
+                } catch (\Exception $e) {
+                    $this->error("✗ Failed to dispatch backup job for {$scheduled_backup->id}: ".$e->getMessage());
+                    Log::error('Error dispatching backup job: '.$e->getMessage());
+                }
+            }
+
+            if ($index < $chunks->count() - 1 && ! $dryRun) {
+                $this->info("Waiting {$delay} seconds before next batch...");
+                sleep($delay);
+            }
+        }
+    }
+
+    private function runScheduledTasks(int $chunkSize, int $delay, ?int $maxJobs = null, bool $dryRun = false): void
+    {
+        $this->info('Processing scheduled tasks...');
+
+        $scheduled_tasks = ScheduledTask::where('enabled', true)->get();
+
+        if ($scheduled_tasks->isEmpty()) {
+            $this->info('No enabled scheduled tasks found.');
+
+            return;
+        }
+
+        $finalScheduledTasks = collect();
+
+        foreach ($scheduled_tasks as $scheduled_task) {
+            $service = $scheduled_task->service;
+            $application = $scheduled_task->application;
+
+            $server = $scheduled_task->server();
+            if (blank($server)) {
+                $this->warn("Deleting task {$scheduled_task->id} - missing server");
+                $scheduled_task->delete();
+
+                continue;
+            }
+
+            if ($server->isFunctional() === false) {
+                $this->warn("Skipping task {$scheduled_task->id} - server not functional");
+
+                continue;
+            }
+
+            if (isCloud() && data_get($server->team->subscription, 'stripe_invoice_paid', false) === false && $server->team->id !== 0) {
+                $this->warn("Skipping task {$scheduled_task->id} - subscription not paid");
+
+                continue;
+            }
+
+            if (! $service && ! $application) {
+                $this->warn("Deleting task {$scheduled_task->id} - missing service and application");
+                $scheduled_task->delete();
+
+                continue;
+            }
+
+            if ($application && str($application->status)->contains('running') === false) {
+                $this->warn("Skipping task {$scheduled_task->id} - application not running");
+
+                continue;
+            }
+
+            if ($service && str($service->status)->contains('running') === false) {
+                $this->warn("Skipping task {$scheduled_task->id} - service not running");
+
+                continue;
+            }
+
+            $finalScheduledTasks->push($scheduled_task);
+        }
+
+        if ($maxJobs && $finalScheduledTasks->count() > $maxJobs) {
+            $finalScheduledTasks = $finalScheduledTasks->take($maxJobs);
+            $this->info("Limited to {$maxJobs} scheduled tasks for testing");
+        }
+
+        $this->info("Found {$finalScheduledTasks->count()} valid scheduled tasks to process");
+
+        $chunks = $finalScheduledTasks->chunk($chunkSize);
+        foreach ($chunks as $index => $chunk) {
+            $this->info('Processing task batch '.($index + 1).' of '.$chunks->count()." ({$chunk->count()} items)");
+
+            foreach ($chunk as $scheduled_task) {
+                try {
+                    if ($dryRun) {
+                        $this->info("🔍 Would dispatch task job for: {$scheduled_task->name} (ID: {$scheduled_task->id})");
+                    } else {
+                        ScheduledTaskJob::dispatch($scheduled_task);
+                        $this->info("✓ Dispatched task job for: {$scheduled_task->name} (ID: {$scheduled_task->id})");
+                    }
+                } catch (\Exception $e) {
+                    $this->error("✗ Failed to dispatch task job for {$scheduled_task->id}: ".$e->getMessage());
+                    Log::error('Error dispatching task job: '.$e->getMessage());
+                }
+            }
+
+            if ($index < $chunks->count() - 1 && ! $dryRun) {
+                $this->info("Waiting {$delay} seconds before next batch...");
+                sleep($delay);
+            }
+        }
+    }
+}

config/constants.php

@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.420.4',
+        'version' => '4.0.0-beta.420.5',
         'helper_version' => '1.0.8',
         'realtime_version' => '1.0.9',
         'self_hosted' => env('SELF_HOSTED', true),

resources/views/livewire/project/database/postgresql/general.blade.php

@@ -74,18 +74,15 @@
             @endif
         </div>
         <div class="flex flex-col gap-2">
-            <div class="flex items-center justify-between py-2">
+            <div class="flex items-center gap-2 py-2">
-                <div class="flex items-center justify-between w-full">
+                <h3>SSL Configuration</h3>
-                    <h3>SSL Configuration</h3>
+                @if ($database->enable_ssl && $certificateValidUntil)
-                    @if ($database->enable_ssl && $certificateValidUntil)
+                    <x-modal-confirmation title="Regenerate SSL Certificates" buttonTitle="Regenerate SSL Certificates"
-                        <x-modal-confirmation title="Regenerate SSL Certificates"
+                        :actions="[
-                            buttonTitle="Regenerate SSL Certificates" :actions="[
+                            'The SSL certificate of this database will be regenerated.',
-                                'The SSL certificate of this database will be regenerated.',
+                            'You must restart the database after regenerating the certificate to start using the new certificate.',
-                                'You must restart the database after regenerating the certificate to start using the new certificate.',
+                        ]" submitAction="regenerateSslCertificate" :confirmWithText="false" :confirmWithPassword="false" />
-                            ]"
+                @endif
-                            submitAction="regenerateSslCertificate" :confirmWithText="false" :confirmWithPassword="false" />
-                    @endif
-                </div>
             </div>
             @if ($database->enable_ssl && $certificateValidUntil)
                 <span class="text-sm">Valid until:
@@ -140,11 +137,9 @@
                 @endif
 
                 <div class="flex flex-col gap-2">
-                    <div class="flex items-center justify-between py-2">
+                    <div class="flex items-center gap-2 py-2">
-                        <div class="flex items-center gap-2">
+                        <h3>Proxy</h3>
-                            <h3>Proxy</h3>
+                        <x-loading wire:loading wire:target="instantSave" />
-                            <x-loading wire:loading wire:target="instantSave" />
-                        </div>
                         @if (data_get($database, 'is_public'))
                             <x-slide-over fullScreen>
                                 <x-slot:title>Proxy Logs</x-slot:title>
@@ -157,11 +152,11 @@
                             </x-slide-over>
                         @endif
                     </div>
-                    <div class="flex flex-col gap-2">
+                    <div class="flex flex-col gap-2 w-64">
                         <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
-                        <x-forms.input placeholder="5432" disabled="{{ data_get($database, 'is_public') }}"
-                            id="database.public_port" label="Public Port" />
                     </div>
+                    <x-forms.input placeholder="5432" disabled="{{ data_get($database, 'is_public') }}"
+                        id="database.public_port" label="Public Port" />
                 </div>
 
                 <div class="flex flex-col gap-2">

versions.json

@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.420.4"
+            "version": "4.0.0-beta.420.5"
         },
         "nightly": {
-            "version": "4.0.0-beta.420.5"
+            "version": "4.0.0-beta.420.6"
         },
         "helper": {
             "version": "1.0.8"