cupcakearmy/coolify
1
0
Fork 0
mirror of https://github.com/cupcakearmy/coolify.git synced 2024-10-22 08:04:19 +02:00
Code Issues Actions 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
Show Stats 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;
use App\Jobs\CheckForUpdatesJob;
use App\Jobs\CheckLogDrainContainerJob;
use App\Jobs\CleanupInstanceStuffsJob;
use App\Jobs\ContainerStatusJob;
@ -15,7 +16,6 @@
use App\Jobs\ServerCheckJob;
use App\Jobs\ServerStatusJob;
use App\Jobs\UpdateCoolifyJob;
use App\Jobs\CheckForUpdatesJob;
use App\Models\InstanceSettings;
use App\Models\ScheduledDatabaseBackup;
use App\Models\ScheduledTask;
@ -83,11 +83,11 @@ private function scheduleUpdates($schedule)
$settings = InstanceSettings::get();
$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) {
$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 @@ protected function commands(): void
require base_path('routes/console.php');
}
}
}

2
app/Jobs/CheckForUpdatesJob.php
View File

@ -41,4 +41,4 @@ public function handle(): void
// Consider implementing a notification to administrators
}
}
}
}

2
app/Jobs/PullCoolifyImageJob.php
View File

@ -47,4 +47,4 @@ public function handle(): void
throw $e;
}
}
}
}

15
app/Jobs/UpdateCoolifyJob.php
View File

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

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

@ -4,8 +4,8 @@
use App\Models\InstanceSettings as ModelsInstanceSettings;
use App\Models\Server;
use Livewire\Component;
use Cron\CronExpression;
use Livewire\Component;
class Configuration extends Component
{
@ -91,13 +91,15 @@ public function submit()
}
$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.');
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.');
return;
}
@ -163,15 +165,15 @@ private function validateCronExpression($expression): bool
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.');
}
}
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.');
}
}
}
}