rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(service): enhance service status handling and UI updates

Browse source
This commit is contained in:
Andras Bacsai 2025-06-24 12:52:22 +02:00
parent 3643a388bf
commit 8fc79022f3
6 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Actions/Service/StartService.php
View file

@ -41,6 +41,6 @@ public function handle(Service $service, bool $pullLatestImages = false, bool $s
}
}
return remote_process($commands, $service->server, type_uuid: $service->uuid);
return remote_process($commands, $service->server, type_uuid: $service->uuid, callEventOnFinish: 'ServiceStatusChanged');
}
}

9
app/Livewire/Project/Service/Heading.php
View file

@ -6,7 +6,6 @@
use App\Actions\Service\StartService;
use App\Actions\Service\StopService;
use App\Enums\ProcessStatus;
use App\Events\ServiceStatusChanged;
use App\Models\Service;
use Illuminate\Support\Facades\Auth;
use Livewire\Component;
@ -96,7 +95,7 @@ public function checkDeployments()
public function start()
{
$activity = StartService::run($this->service, pullLatestImages: true);
$this->dispatch('activityMonitor', $activity->id, ServiceStatusChanged::class);
$this->dispatch('activityMonitor', $activity->id);
}
public function forceDeploy()
@ -112,7 +111,7 @@ public function forceDeploy()
$activity->save();
}
$activity = StartService::run($this->service, pullLatestImages: true, stopBeforeStart: true);
$this->dispatch('activityMonitor', $activity->id, ServiceStatusChanged::class);
$this->dispatch('activityMonitor', $activity->id);
} catch (\Exception $e) {
$this->dispatch('error', $e->getMessage());
}
@ -136,7 +135,7 @@ public function restart()
return;
}
$activity = StartService::run($this->service, stopBeforeStart: true);
$this->dispatch('activityMonitor', $activity->id, ServiceStatusChanged::class);
$this->dispatch('activityMonitor', $activity->id);
}
public function pullAndRestartEvent()
@ -148,7 +147,7 @@ public function pullAndRestartEvent()
return;
}
$activity = StartService::run($this->service, pullLatestImages: true, stopBeforeStart: true);
$this->dispatch('activityMonitor', $activity->id, ServiceStatusChanged::class);
$this->dispatch('activityMonitor', $activity->id);
}
public function render()

18
app/Models/Service.php
View file

@ -2,6 +2,7 @@
namespace App\Models;
use App\Enums\ProcessStatus;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\HasMany;
@ -9,6 +10,7 @@
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Storage;
use OpenApi\Attributes as OA;
use Spatie\Activitylog\Models\Activity;
use Spatie\Url\Url;
use Visus\Cuid2\Cuid2;
@ -116,6 +118,18 @@ public function isExited()
return (bool) str($this->status)->contains('exited');
}
public function isStarting(): bool
{
try {
$activity = Activity::where('properties->type_uuid', $this->uuid)->latest()->first();
$status = data_get($activity, 'properties.status');
return $status === ProcessStatus::QUEUED->value || $status === ProcessStatus::IN_PROGRESS->value;
} catch (\Throwable) {
return false;
}
}
public function type()
{
return 'service';
@ -159,6 +173,10 @@ public function deleteConnectedNetworks()
public function getStatusAttribute()
{
if ($this->isStarting()) {
return 'starting:unhealthy';
}
$applications = $this->applications;
$databases = $this->databases;

2
resources/views/components/status/services.blade.php
View file

@ -1,5 +1,7 @@
@if (str($complexStatus)->contains('running'))
<x-status.running :status="$complexStatus" />
@elseif(str($complexStatus)->contains('starting'))
<x-status.restarting :status="$complexStatus" />
@elseif(str($complexStatus)->contains('restarting'))
<x-status.restarting :status="$complexStatus" />
@elseif(str($complexStatus)->contains('degraded'))

9
resources/views/livewire/project/resource/index.blade.php
View file

@ -72,6 +72,9 @@ class="grid grid-cols-1 gap-4 pt-4 lg:grid-cols-2 xl:grid-cols-3">
<template x-if="item.status.startsWith('exited')">
<div title="exited" class="bg-error badge-dashboard"></div>
</template>
<template x-if="item.status.startsWith('starting')">
<div title="starting" class="bg-warning badge-dashboard"></div>
</template>
<template x-if="item.status.startsWith('restarting')">
<div title="restarting" class="bg-warning badge-dashboard"></div>
</template>
@ -118,6 +121,9 @@ class="grid grid-cols-1 gap-4 pt-4 lg:grid-cols-2 xl:grid-cols-3">
<template x-if="item.status.startsWith('exited')">
<div title="exited" class="bg-error badge-dashboard"></div>
</template>
<template x-if="item.status.startsWith('starting')">
<div title="starting" class="bg-warning badge-dashboard"></div>
</template>
<template x-if="item.status.startsWith('restarting')">
<div title="restarting" class="bg-warning badge-dashboard"></div>
</template>
@ -164,6 +170,9 @@ class="grid grid-cols-1 gap-4 pt-4 lg:grid-cols-2 xl:grid-cols-3">
<template x-if="item.status.startsWith('exited')">
<div title="exited" class="bg-error badge-dashboard"></div>
</template>
<template x-if="item.status.startsWith('starting')">
<div title="starting" class="bg-warning badge-dashboard"></div>
</template>
<template x-if="item.status.startsWith('restarting')">
<div title="restarting" class="bg-warning badge-dashboard"></div>
</template>

4
resources/views/livewire/project/service/heading.blade.php
View file

@ -136,7 +136,7 @@
<script>
$wire.$on('stopEvent', () => {
$wire.$dispatch('info',
'Gracefully stopping service.<br/>It could take a while depending on the service.');
'Gracefully stopping service.<br/><br/>It could take a while depending on the service.');
$wire.$call('stop');
});
$wire.$on('startEvent', async () => {
@ -163,7 +163,7 @@
return;
}
$wire.$dispatch('info',
'Gracefully stopping service.<br/>It could take a while depending on the service.');
'Gracefully stopping service.<br/><br/>It could take a while depending on the service.');
window.dispatchEvent(new CustomEvent('startservice'));
$wire.$call('restart');
});