- Add retry configuration to CoolifyTask (3 tries, 600s timeout) - Add retry configuration to ScheduledTaskJob (3 tries, configurable timeout) - Add retry configuration to DatabaseBackupJob (2 tries) - Implement exponential backoff for all jobs (30s, 60s, 120s intervals) - Add failed() handlers with comprehensive error logging to scheduled-errors channel - Add execution tracking: started_at, retry_count, duration (decimal), error_details - Add configurable timeout field to scheduled tasks (60-3600s, default 300s) - Update UI to include timeout configuration in task creation/editing forms - Increase ScheduledJobManager lock expiration from 60s to 90s for high-load environments - Implement safe queue cleanup with restart vs runtime modes - Restart mode: aggressive cleanup (marks all processing jobs as failed) - Runtime mode: conservative cleanup (only marks jobs >12h as failed, skips deployments) - Add cleanup:redis --restart flag for system startup - Integrate cleanup into Dev.php init() for development environment - Increase scheduled-errors log retention from 7 to 14 days - Create comprehensive test suite (unit and feature tests) - Add TESTING_GUIDE.md with manual testing instructions Fixes issues with jobs failing after single attempt and "attempted too many times" errors
140 lines
3.8 KiB
PHP
140 lines
3.8 KiB
PHP
<?php
|
|
|
|
namespace App\Livewire\Project\Shared\ScheduledTask;
|
|
|
|
use App\Models\ScheduledTask;
|
|
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
|
|
use Illuminate\Support\Collection;
|
|
use Livewire\Attributes\Locked;
|
|
use Livewire\Component;
|
|
|
|
class Add extends Component
|
|
{
|
|
use AuthorizesRequests;
|
|
|
|
public $parameters;
|
|
|
|
#[Locked]
|
|
public string $id;
|
|
|
|
#[Locked]
|
|
public string $type;
|
|
|
|
#[Locked]
|
|
public Collection $containerNames;
|
|
|
|
#[Locked]
|
|
public $resource;
|
|
|
|
public string $name;
|
|
|
|
public string $command;
|
|
|
|
public string $frequency;
|
|
|
|
public ?string $container = '';
|
|
|
|
public int $timeout = 300;
|
|
|
|
protected $rules = [
|
|
'name' => 'required|string',
|
|
'command' => 'required|string',
|
|
'frequency' => 'required|string',
|
|
'container' => 'nullable|string',
|
|
'timeout' => 'required|integer|min:60|max:3600',
|
|
];
|
|
|
|
protected $validationAttributes = [
|
|
'name' => 'name',
|
|
'command' => 'command',
|
|
'frequency' => 'frequency',
|
|
'container' => 'container',
|
|
'timeout' => 'timeout',
|
|
];
|
|
|
|
public function mount()
|
|
{
|
|
$this->parameters = get_route_parameters();
|
|
|
|
// Get the resource based on type and id
|
|
switch ($this->type) {
|
|
case 'application':
|
|
$this->resource = \App\Models\Application::findOrFail($this->id);
|
|
break;
|
|
case 'service':
|
|
$this->resource = \App\Models\Service::findOrFail($this->id);
|
|
break;
|
|
case 'standalone-postgresql':
|
|
$this->resource = \App\Models\StandalonePostgresql::findOrFail($this->id);
|
|
break;
|
|
default:
|
|
throw new \Exception('Invalid resource type');
|
|
}
|
|
|
|
if ($this->containerNames->count() > 0) {
|
|
$this->container = $this->containerNames->first();
|
|
}
|
|
}
|
|
|
|
public function submit()
|
|
{
|
|
try {
|
|
$this->authorize('update', $this->resource);
|
|
$this->validate();
|
|
$isValid = validate_cron_expression($this->frequency);
|
|
if (! $isValid) {
|
|
$this->dispatch('error', 'Invalid Cron / Human expression.');
|
|
|
|
return;
|
|
}
|
|
if (empty($this->container) || $this->container === 'null') {
|
|
if ($this->type === 'service') {
|
|
$this->container = $this->subServiceName;
|
|
}
|
|
}
|
|
$this->saveScheduledTask();
|
|
$this->clear();
|
|
} catch (\Exception $e) {
|
|
return handleError($e, $this);
|
|
}
|
|
}
|
|
|
|
public function saveScheduledTask()
|
|
{
|
|
try {
|
|
$task = new ScheduledTask;
|
|
$task->name = $this->name;
|
|
$task->command = $this->command;
|
|
$task->frequency = $this->frequency;
|
|
$task->container = $this->container;
|
|
$task->timeout = $this->timeout;
|
|
$task->team_id = currentTeam()->id;
|
|
|
|
switch ($this->type) {
|
|
case 'application':
|
|
$task->application_id = $this->id;
|
|
break;
|
|
case 'standalone-postgresql':
|
|
$task->standalone_postgresql_id = $this->id;
|
|
break;
|
|
case 'service':
|
|
$task->service_id = $this->id;
|
|
break;
|
|
}
|
|
$task->save();
|
|
$this->dispatch('refreshTasks');
|
|
$this->dispatch('success', 'Scheduled task added.');
|
|
} catch (\Throwable $e) {
|
|
return handleError($e, $this);
|
|
}
|
|
}
|
|
|
|
public function clear()
|
|
{
|
|
$this->name = '';
|
|
$this->command = '';
|
|
$this->frequency = '';
|
|
$this->container = '';
|
|
$this->timeout = 300;
|
|
}
|
|
}
|