diff --git a/app/Actions/Database/StartDatabaseProxy.php b/app/Actions/Database/StartDatabaseProxy.php index 5c2f4d7fd..12fd92792 100644 --- a/app/Actions/Database/StartDatabaseProxy.php +++ b/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, }; } diff --git a/app/Console/Commands/RunScheduledJobsManually.php b/app/Console/Commands/RunScheduledJobsManually.php new file mode 100644 index 000000000..1685d47cc --- /dev/null +++ b/app/Console/Commands/RunScheduledJobsManually.php @@ -0,0 +1,217 @@ +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); + } + } + } +} diff --git a/config/constants.php b/config/constants.php index 8fbc3a6cb..dde69362b 100644 --- a/config/constants.php +++ b/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), diff --git a/resources/views/livewire/project/database/postgresql/general.blade.php b/resources/views/livewire/project/database/postgresql/general.blade.php index ea15df559..50575f6c7 100644 --- a/resources/views/livewire/project/database/postgresql/general.blade.php +++ b/resources/views/livewire/project/database/postgresql/general.blade.php @@ -74,18 +74,15 @@ @endif
-
-
-

SSL Configuration

- @if ($database->enable_ssl && $certificateValidUntil) - - @endif -
+
+

SSL Configuration

+ @if ($database->enable_ssl && $certificateValidUntil) + + @endif
@if ($database->enable_ssl && $certificateValidUntil) Valid until: @@ -140,11 +137,9 @@ @endif
-
-
-

Proxy

- -
+
+

Proxy

+ @if (data_get($database, 'is_public')) Proxy Logs @@ -157,11 +152,11 @@ @endif
-
+
-
+
diff --git a/versions.json b/versions.json index f93f0350c..8a962b51d 100644 --- a/versions.json +++ b/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"