Fix styling
This commit is contained in:

committed by
github-actions[bot]
![github-actions[bot]](/assets/img/avatar_default.png)
parent
c4436aadfa
commit
8b817dad87
@@ -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\ScheduledTaskJob;
|
||||
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 @@ class Kernel extends ConsoleKernel
|
||||
$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();
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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\Contracts\Queue\ShouldQueue;
|
||||
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 @@ class UpdateCoolifyJob implements ShouldBeEncrypted, ShouldQueue
|
||||
{
|
||||
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,7 +49,7 @@ class UpdateCoolifyJob implements ShouldBeEncrypted, ShouldQueue
|
||||
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
|
||||
}
|
||||
}
|
||||
|
@@ -4,8 +4,8 @@ namespace App\Livewire\Settings;
|
||||
|
||||
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 @@ class Configuration extends Component
|
||||
}
|
||||
$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,14 +165,14 @@ class Configuration extends Component
|
||||
|
||||
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.');
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user