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

refactor(ApplicationDeploymentJob, ApplicationDeploymentQueue): improve deployment status handling and log entry management with transaction support

Browse Source
This commit is contained in:
Andras Bacsai
2025-04-11 19:32:41 +02:00
parent ec36825545
commit 46fe0fd7c6
2 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -2459,20 +2459,23 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
private function next(string $status) private function next(string $status)
{ {
queue_next_deployment($this->application); queue_next_deployment($this->application);
// If the deployment is cancelled by the user, don't update the status
if ( // Never allow changing status from FAILED or CANCELLED_BY_USER to anything else
$this->application_deployment_queue->status !== ApplicationDeploymentStatus::CANCELLED_BY_USER->value && if ($this->application_deployment_queue->status === ApplicationDeploymentStatus::FAILED->value ||
$this->application_deployment_queue->status !== ApplicationDeploymentStatus::FAILED->value $this->application_deployment_queue->status === ApplicationDeploymentStatus::CANCELLED_BY_USER->value) {
) { return;
$this->application_deployment_queue->update([
'status' => $status,
]);
} }
if ($this->application_deployment_queue->status === ApplicationDeploymentStatus::FAILED->value) {
$this->application_deployment_queue->update([
'status' => $status,
]);
if ($status === ApplicationDeploymentStatus::FAILED->value) {
$this->application->environment->project->team?->notify(new DeploymentFailed($this->application, $this->deployment_uuid, $this->preview)); $this->application->environment->project->team?->notify(new DeploymentFailed($this->application, $this->deployment_uuid, $this->preview));
return; return;
} }
if ($status === ApplicationDeploymentStatus::FINISHED->value) { if ($status === ApplicationDeploymentStatus::FINISHED->value) {
if (! $this->only_this_server) { if (! $this->only_this_server) {
$this->deploy_to_additional_destinations(); $this->deploy_to_additional_destinations();

31
app/Models/ApplicationDeploymentQueue.php
View File

@@ -5,6 +5,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Carbon; use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\DB;
use OpenApi\Attributes as OA; use OpenApi\Attributes as OA;
#[OA\Schema( #[OA\Schema(
@@ -101,17 +102,23 @@ class ApplicationDeploymentQueue extends Model
'hidden' => $hidden, 'hidden' => $hidden,
'batch' => 1, 'batch' => 1,
]; ];
if ($this->logs) {
$previousLogs = json_decode($this->logs, associative: true, flags: JSON_THROW_ON_ERROR); // Use a transaction to ensure atomicity
$newLogEntry['order'] = count($previousLogs) + 1; DB::transaction(function () use ($newLogEntry) {
$previousLogs[] = $newLogEntry; // Reload the model to get the latest logs
$this->update([ $this->refresh();
'logs' => json_encode($previousLogs, flags: JSON_THROW_ON_ERROR),
]); if ($this->logs) {
} else { $previousLogs = json_decode($this->logs, associative: true, flags: JSON_THROW_ON_ERROR);
$this->update([ $newLogEntry['order'] = count($previousLogs) + 1;
'logs' => json_encode([$newLogEntry], flags: JSON_THROW_ON_ERROR), $previousLogs[] = $newLogEntry;
]); $this->logs = json_encode($previousLogs, flags: JSON_THROW_ON_ERROR);
} } else {
$this->logs = json_encode([$newLogEntry], flags: JSON_THROW_ON_ERROR);
}
// Save without triggering events to prevent potential race conditions
$this->saveQuietly();
});
} }
} }