mirror of
https://github.com/cupcakearmy/coolify.git
synced 2024-10-22 08:04:19 +02:00
added defaults, remove duplicated cron validation
This commit is contained in:
parent
38976dac12
commit
4dfec6771c
@ -45,14 +45,9 @@ protected function schedule(Schedule $schedule): void
|
||||
$schedule->command('cleanup:unreachable-servers')->daily();
|
||||
$schedule->job(new PullTemplatesFromCDN)->daily()->onOneServer();
|
||||
$schedule->job(new CleanupInstanceStuffsJob)->everyFiveMinutes()->onOneServer();
|
||||
|
||||
if ($settings->update_check_frequency && $this->isValidCronExpression($settings->update_check_frequency)) {
|
||||
$schedule->job(new PullCoolifyImageJob)->cron($settings->update_check_frequency)->onOneServer();
|
||||
} else {
|
||||
// Default to every 12 hours if not set or invalid
|
||||
$schedule->job(new PullCoolifyImageJob)->twiceDaily()->onOneServer();
|
||||
}
|
||||
|
||||
$schedule->job(new PullCoolifyImageJob)->cron($settings->update_check_frequency ?? '0 0 * * *')->onOneServer();
|
||||
$schedule->job(new CheckForUpdatesJob())->cron($settings->auto_update_frequency ?? '0 11,23 * * *')->onOneServer();
|
||||
|
||||
// Server Jobs
|
||||
$this->scheduleUpdates($schedule);
|
||||
$this->pull_images($schedule);
|
||||
@ -81,32 +76,12 @@ private function scheduleUpdates($schedule)
|
||||
{
|
||||
$settings = InstanceSettings::get();
|
||||
|
||||
// Schedule update check
|
||||
if ($settings->update_check_frequency && $this->isValidCronExpression($settings->update_check_frequency)) {
|
||||
$schedule->job(new CheckForUpdatesJob())->cron($settings->update_check_frequency)->onOneServer();
|
||||
} else {
|
||||
// Default to every 12 hours if not set or invalid
|
||||
$schedule->job(new CheckForUpdatesJob())->twiceDaily()->onOneServer();
|
||||
}
|
||||
$updateCheckFrequency = $settings->update_check_frequency ?? '0 0 * * *'; // Default to daily at 00:00
|
||||
$schedule->job(new CheckForUpdatesJob())->cron($updateCheckFrequency)->onOneServer();
|
||||
|
||||
// Schedule auto-update
|
||||
if ($settings->is_auto_update_enabled) {
|
||||
if ($settings->auto_update_frequency && $this->isValidCronExpression($settings->auto_update_frequency)) {
|
||||
$schedule->job(new UpdateCoolifyJob())->cron($settings->auto_update_frequency)->onOneServer();
|
||||
} else {
|
||||
// Default to every 24 hours if not set or invalid
|
||||
$schedule->job(new UpdateCoolifyJob())->daily()->onOneServer();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function isValidCronExpression($expression)
|
||||
{
|
||||
try {
|
||||
new \Cron\CronExpression($expression);
|
||||
return true;
|
||||
} catch (\Exception $e) {
|
||||
return false;
|
||||
$autoUpdateFrequency = $settings->auto_update_frequency ?? '0 11,23 * * *'; // Default to twice daily at 11:00 and 23:00
|
||||
$schedule->job(new UpdateCoolifyJob())->cron($autoUpdateFrequency)->onOneServer();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -21,9 +21,9 @@ class Configuration extends Component
|
||||
|
||||
public bool $is_api_enabled;
|
||||
|
||||
public ?string $auto_update_frequency;
|
||||
public string $auto_update_frequency;
|
||||
|
||||
public ?string $update_check_frequency;
|
||||
public string $update_check_frequency;
|
||||
|
||||
protected string $dynamic_config_path = '/data/coolify/proxy/dynamic';
|
||||
|
||||
@ -39,7 +39,7 @@ class Configuration extends Component
|
||||
'settings.allowed_ips' => 'nullable',
|
||||
'settings.is_auto_update_enabled' => 'boolean',
|
||||
'auto_update_frequency' => 'nullable|string',
|
||||
'update_check_frequency' => 'required|string',
|
||||
'update_check_frequency' => 'nullable|string',
|
||||
];
|
||||
|
||||
protected $validationAttributes = [
|
||||
@ -91,6 +91,7 @@ public function submit()
|
||||
}
|
||||
$this->validate();
|
||||
|
||||
// Allow empty values and set defaults
|
||||
if ($this->is_auto_update_enabled && !$this->validateCronExpression($this->auto_update_frequency)) {
|
||||
$this->dispatch('error', 'Invalid Cron / Human expression for Auto Update Frequency.');
|
||||
return;
|
||||
@ -131,7 +132,6 @@ public function submit()
|
||||
$this->settings->is_api_enabled = $this->is_api_enabled;
|
||||
$this->settings->auto_update_frequency = $this->auto_update_frequency;
|
||||
$this->settings->update_check_frequency = $this->update_check_frequency;
|
||||
|
||||
$this->settings->save();
|
||||
$this->server->setupDynamicProxyConfiguration();
|
||||
if (! $error_show) {
|
||||
@ -145,7 +145,7 @@ public function submit()
|
||||
private function validateCronExpression($expression): bool
|
||||
{
|
||||
if (empty($expression)) {
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
$isValid = false;
|
||||
try {
|
||||
@ -165,14 +165,14 @@ private function validateCronExpression($expression): bool
|
||||
public function updatedAutoUpdateFrequency()
|
||||
{
|
||||
if (!$this->validateCronExpression($this->auto_update_frequency)) {
|
||||
$this->dispatch('error', 'Invalid Cron / Human expression.');
|
||||
$this->dispatch('error', 'Invalid Cron / Human expression for Auto Update Frequency.');
|
||||
}
|
||||
}
|
||||
|
||||
public function updatedUpdateCheckFrequency()
|
||||
{
|
||||
if (!$this->validateCronExpression($this->update_check_frequency)) {
|
||||
$this->dispatch('error', 'Invalid Cron / Human expression.');
|
||||
$this->dispatch('error', 'Invalid Cron / Human expression for Update Check Frequency.');
|
||||
}
|
||||
}
|
||||
}
|
@ -12,8 +12,8 @@
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('instance_settings', function (Blueprint $table) {
|
||||
$table->string('update_check_frequency')->default('0 */12 * * *')->nullable();
|
||||
$table->string('auto_update_frequency')->default('0 0 * * *')->nullable();
|
||||
$table->string('update_check_frequency')->default('0 */11 * * *')->nullable();
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -45,11 +45,9 @@
|
||||
@else
|
||||
<x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Coolify" />
|
||||
@if($is_auto_update_enabled)
|
||||
<x-forms.input id="auto_update_frequency" label="Auto Update Frequency" placeholder="0 0 * * *" helper="Cron expression for auto update frequency" />
|
||||
@error('settings.auto_update_frequency') <span class="text-error">{{ $message }}</span> @enderror
|
||||
<x-forms.input id="auto_update_frequency" label="Auto Update Frequency" placeholder="0 0 * * *" helper="Cron expression for auto update frequency. Default is every day at 00:00" />
|
||||
@endif
|
||||
<x-forms.input id="update_check_frequency" label="Update Check Frequency" placeholder="0 */12 * * *" helper="Cron expression for update check frequency" />
|
||||
@error('settings.update_check_frequency') <span class="text-error">{{ $message }}</span> @enderror
|
||||
<x-forms.input id="update_check_frequency" label="Update Check Frequency" placeholder="0 */11 * * *" helper="Cron expression for update check frequency. Default is every 12 hours at 11:00" />
|
||||
@endif
|
||||
<x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" />
|
||||
<x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />
|
||||
|
Loading…
Reference in New Issue
Block a user