dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix styling

Browse Source
This commit is contained in:
andrasbacsai
2024-08-06 12:04:23 +00:00
committed by github-actions[bot]
parent c4436aadfa
commit 8b817dad87
5 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Console/Kernel.php
View File

@@ -2,6 +2,7 @@
namespace App\Console; namespace App\Console;
use App\Jobs\CheckForUpdatesJob;
use App\Jobs\CheckLogDrainContainerJob; use App\Jobs\CheckLogDrainContainerJob;
use App\Jobs\CleanupInstanceStuffsJob; use App\Jobs\CleanupInstanceStuffsJob;
use App\Jobs\ContainerStatusJob; use App\Jobs\ContainerStatusJob;
@@ -15,7 +16,6 @@ use App\Jobs\ScheduledTaskJob;
use App\Jobs\ServerCheckJob; use App\Jobs\ServerCheckJob;
use App\Jobs\ServerStatusJob; use App\Jobs\ServerStatusJob;
use App\Jobs\UpdateCoolifyJob; use App\Jobs\UpdateCoolifyJob;
use App\Jobs\CheckForUpdatesJob;
use App\Models\InstanceSettings; use App\Models\InstanceSettings;
use App\Models\ScheduledDatabaseBackup; use App\Models\ScheduledDatabaseBackup;
use App\Models\ScheduledTask; use App\Models\ScheduledTask;
@@ -83,11 +83,11 @@ class Kernel extends ConsoleKernel
$settings = InstanceSettings::get(); $settings = InstanceSettings::get();
$updateCheckFrequency = $settings->update_check_frequency ?? '0 0 * * *'; $updateCheckFrequency = $settings->update_check_frequency ?? '0 0 * * *';
$schedule->job(new CheckForUpdatesJob())->cron($updateCheckFrequency)->onOneServer(); $schedule->job(new CheckForUpdatesJob)->cron($updateCheckFrequency)->onOneServer();
if ($settings->is_auto_update_enabled) { if ($settings->is_auto_update_enabled) {
$autoUpdateFrequency = $settings->auto_update_frequency ?? '0 11,23 * * *'; $autoUpdateFrequency = $settings->auto_update_frequency ?? '0 11,23 * * *';
$schedule->job(new UpdateCoolifyJob())->cron($autoUpdateFrequency)->onOneServer(); $schedule->job(new UpdateCoolifyJob)->cron($autoUpdateFrequency)->onOneServer();
} }
} }
@@ -214,4 +214,4 @@ class Kernel extends ConsoleKernel
require base_path('routes/console.php'); require base_path('routes/console.php');
} }
} }

2
app/Jobs/CheckForUpdatesJob.php
View File

@@ -41,4 +41,4 @@ class CheckForUpdatesJob implements ShouldBeEncrypted, ShouldQueue
// Consider implementing a notification to administrators // Consider implementing a notification to administrators
} }
} }
} }

2
app/Jobs/PullCoolifyImageJob.php
View File

@@ -47,4 +47,4 @@ class PullCoolifyImageJob implements ShouldBeEncrypted, ShouldQueue
throw $e; throw $e;
} }
} }
} }

15
app/Jobs/UpdateCoolifyJob.php
View File

@@ -2,6 +2,7 @@
namespace App\Jobs; namespace App\Jobs;
use App\Actions\Server\UpdateCoolify;
use App\Models\InstanceSettings; use App\Models\InstanceSettings;
use App\Models\Server; use App\Models\Server;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
@@ -10,7 +11,6 @@ use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use App\Actions\Server\UpdateCoolify;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
class UpdateCoolifyJob implements ShouldBeEncrypted, ShouldQueue class UpdateCoolifyJob implements ShouldBeEncrypted, ShouldQueue
@@ -23,19 +23,22 @@ class UpdateCoolifyJob implements ShouldBeEncrypted, ShouldQueue
{ {
try { try {
$settings = InstanceSettings::get(); $settings = InstanceSettings::get();
if (!$settings->is_auto_update_enabled) { if (! $settings->is_auto_update_enabled) {
Log::info('Auto-update is disabled. Skipping update check.'); Log::info('Auto-update is disabled. Skipping update check.');
return; return;
} }
if (!$settings->new_version_available) { if (! $settings->new_version_available) {
Log::info('No new version available. Skipping update.'); Log::info('No new version available. Skipping update.');
return; return;
} }
$server = Server::findOrFail(0); $server = Server::findOrFail(0);
if (!$server) { if (! $server) {
Log::error('Server not found. Cannot proceed with update.'); Log::error('Server not found. Cannot proceed with update.');
return; return;
} }
@@ -46,8 +49,8 @@ class UpdateCoolifyJob implements ShouldBeEncrypted, ShouldQueue
Log::info('Coolify update completed successfully.'); Log::info('Coolify update completed successfully.');
} catch (\Throwable $e) { } catch (\Throwable $e) {
Log::error('UpdateCoolifyJob failed: ' . $e->getMessage()); Log::error('UpdateCoolifyJob failed: '.$e->getMessage());
// Consider implementing a notification to administrators // Consider implementing a notification to administrators
} }
} }
} }

14
app/Livewire/Settings/Configuration.php
View File

@@ -4,8 +4,8 @@ namespace App\Livewire\Settings;
use App\Models\InstanceSettings as ModelsInstanceSettings; use App\Models\InstanceSettings as ModelsInstanceSettings;
use App\Models\Server; use App\Models\Server;
use Livewire\Component;
use Cron\CronExpression; use Cron\CronExpression;
use Livewire\Component;
class Configuration extends Component class Configuration extends Component
{ {
@@ -91,13 +91,15 @@ class Configuration extends Component
} }
$this->validate(); $this->validate();
if ($this->is_auto_update_enabled && !$this->validateCronExpression($this->auto_update_frequency)) { if ($this->is_auto_update_enabled && ! $this->validateCronExpression($this->auto_update_frequency)) {
$this->dispatch('error', 'Invalid Cron / Human expression for Auto Update Frequency.'); $this->dispatch('error', 'Invalid Cron / Human expression for Auto Update Frequency.');
return; return;
} }
if (!$this->validateCronExpression($this->update_check_frequency)) { if (! $this->validateCronExpression($this->update_check_frequency)) {
$this->dispatch('error', 'Invalid Cron / Human expression for Update Check Frequency.'); $this->dispatch('error', 'Invalid Cron / Human expression for Update Check Frequency.');
return; return;
} }
@@ -163,15 +165,15 @@ class Configuration extends Component
public function updatedAutoUpdateFrequency() public function updatedAutoUpdateFrequency()
{ {
if (!$this->validateCronExpression($this->auto_update_frequency)) { if (! $this->validateCronExpression($this->auto_update_frequency)) {
$this->dispatch('error', 'Invalid Cron / Human expression for Auto Update Frequency.'); $this->dispatch('error', 'Invalid Cron / Human expression for Auto Update Frequency.');
} }
} }
public function updatedUpdateCheckFrequency() public function updatedUpdateCheckFrequency()
{ {
if (!$this->validateCronExpression($this->update_check_frequency)) { if (! $this->validateCronExpression($this->update_check_frequency)) {
$this->dispatch('error', 'Invalid Cron / Human expression for Update Check Frequency.'); $this->dispatch('error', 'Invalid Cron / Human expression for Update Check Frequency.');
} }
} }
} }