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

chore: Update project service configuration view

Browse Source
This commit is contained in:
Andras Bacsai
2024-10-14 19:45:03 +02:00
parent bdd6597451
commit fdeb9353be
2 changed files with 130 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
app/Jobs/PushServerUpdateJob.php
View File

@@ -3,6 +3,7 @@
namespace App\Jobs; namespace App\Jobs;
use App\Actions\Database\StartDatabaseProxy; use App\Actions\Database\StartDatabaseProxy;
use App\Actions\Database\StopDatabaseProxy;
use App\Actions\Proxy\StartProxy; use App\Actions\Proxy\StartProxy;
use App\Actions\Shared\ComplexStatusCheck; use App\Actions\Shared\ComplexStatusCheck;
use App\Models\Application; use App\Models\Application;
@@ -76,6 +77,7 @@ class PushServerUpdateJob implements ShouldQueue
public function handle() public function handle()
{ {
try {
if (! $this->data) { if (! $this->data) {
throw new \Exception('No data provided'); throw new \Exception('No data provided');
} }
@@ -105,7 +107,7 @@ class PushServerUpdateJob implements ShouldQueue
}); });
}); });
logger('allServiceApplicationIds', ['allServiceApplicationIds' => $this->allServiceApplicationIds]); ray('allServiceApplicationIds', ['allServiceApplicationIds' => $this->allServiceApplicationIds]);
foreach ($this->containers as $container) { foreach ($this->containers as $container) {
$containerStatus = data_get($container, 'state', 'exited'); $containerStatus = data_get($container, 'state', 'exited');
@@ -119,27 +121,27 @@ class PushServerUpdateJob implements ShouldQueue
$pullRequestId = data_get($labels, 'coolify.pullRequestId', '0'); $pullRequestId = data_get($labels, 'coolify.pullRequestId', '0');
try { try {
if ($pullRequestId === '0') { if ($pullRequestId === '0') {
if ($this->allApplicationIds->contains($applicationId)) { if ($this->allApplicationIds->contains($applicationId) && $this->isRunning($containerStatus)) {
$this->foundApplicationIds->push($applicationId); $this->foundApplicationIds->push($applicationId);
} }
$this->updateApplicationStatus($applicationId, $containerStatus); $this->updateApplicationStatus($applicationId, $containerStatus);
} else { } else {
if ($this->allApplicationPreviewsIds->contains($applicationId)) { if ($this->allApplicationPreviewsIds->contains($applicationId) && $this->isRunning($containerStatus)) {
$this->foundApplicationPreviewsIds->push($applicationId); $this->foundApplicationPreviewsIds->push($applicationId);
} }
$this->updateApplicationPreviewStatus($applicationId, $containerStatus); $this->updateApplicationPreviewStatus($applicationId, $containerStatus);
} }
} catch (\Exception $e) { } catch (\Exception $e) {
logger()->error($e); ray()->error($e);
} }
} elseif ($labels->has('coolify.serviceId')) { } elseif ($labels->has('coolify.serviceId')) {
$serviceId = $labels->get('coolify.serviceId'); $serviceId = $labels->get('coolify.serviceId');
$subType = $labels->get('coolify.service.subType'); $subType = $labels->get('coolify.service.subType');
$subId = $labels->get('coolify.service.subId'); $subId = $labels->get('coolify.service.subId');
if ($subType === 'application') { if ($subType === 'application' && $this->isRunning($containerStatus)) {
$this->foundServiceApplicationIds->push($subId); $this->foundServiceApplicationIds->push($subId);
$this->updateServiceSubStatus($serviceId, $subType, $subId, $containerStatus); $this->updateServiceSubStatus($serviceId, $subType, $subId, $containerStatus);
} elseif ($subType === 'database') { } elseif ($subType === 'database' && $this->isRunning($containerStatus)) {
$this->foundServiceDatabaseIds->push($subId); $this->foundServiceDatabaseIds->push($subId);
$this->updateServiceSubStatus($serviceId, $subType, $subId, $containerStatus); $this->updateServiceSubStatus($serviceId, $subType, $subId, $containerStatus);
} }
@@ -148,17 +150,14 @@ class PushServerUpdateJob implements ShouldQueue
$name = data_get($container, 'name'); $name = data_get($container, 'name');
$uuid = $labels->get('com.docker.compose.service'); $uuid = $labels->get('com.docker.compose.service');
$type = $labels->get('coolify.type'); $type = $labels->get('coolify.type');
if ($name === 'coolify-proxy') { if ($name === 'coolify-proxy' && $this->isRunning($containerStatus)) {
logger("Proxy: $uuid, $containerStatus");
if (str($containerStatus)->contains('running')) {
$this->foundProxy = true; $this->foundProxy = true;
} } elseif ($type === 'service' && $this->isRunning($containerStatus)) {
} elseif ($type === 'service') { ray("Service: $uuid, $containerStatus");
logger("Service: $uuid, $containerStatus");
} else { } else {
if ($this->allDatabaseUuids->contains($uuid)) { if ($this->allDatabaseUuids->contains($uuid) && $this->isRunning($containerStatus)) {
$this->foundDatabaseUuids->push($uuid); $this->foundDatabaseUuids->push($uuid);
if ($this->allTcpProxyUuids->contains($uuid)) { if ($this->allTcpProxyUuids->contains($uuid) && $this->isRunning($containerStatus)) {
$this->updateDatabaseStatus($uuid, $containerStatus, tcpProxy: true); $this->updateDatabaseStatus($uuid, $containerStatus, tcpProxy: true);
} else { } else {
$this->updateDatabaseStatus($uuid, $containerStatus, tcpProxy: false); $this->updateDatabaseStatus($uuid, $containerStatus, tcpProxy: false);
@@ -177,6 +176,10 @@ class PushServerUpdateJob implements ShouldQueue
$this->updateNotFoundServiceStatus(); $this->updateNotFoundServiceStatus();
$this->updateAdditionalServersStatus(); $this->updateAdditionalServersStatus();
} catch (\Exception $e) {
throw $e;
}
} }
private function updateApplicationStatus(string $applicationId, string $containerStatus) private function updateApplicationStatus(string $applicationId, string $containerStatus)
@@ -187,7 +190,7 @@ class PushServerUpdateJob implements ShouldQueue
} }
$application->status = $containerStatus; $application->status = $containerStatus;
$application->save(); $application->save();
logger('Application updated', ['application_id' => $applicationId, 'status' => $containerStatus]); ray('Application updated', ['application_id' => $applicationId, 'status' => $containerStatus]);
} }
private function updateApplicationPreviewStatus(string $applicationId, string $containerStatus) private function updateApplicationPreviewStatus(string $applicationId, string $containerStatus)
@@ -198,21 +201,21 @@ class PushServerUpdateJob implements ShouldQueue
} }
$application->status = $containerStatus; $application->status = $containerStatus;
$application->save(); $application->save();
logger('Application preview updated', ['application_id' => $applicationId, 'status' => $containerStatus]); ray('Application preview updated', ['application_id' => $applicationId, 'status' => $containerStatus]);
} }
private function updateNotFoundApplicationStatus() private function updateNotFoundApplicationStatus()
{ {
$notFoundApplicationIds = $this->allApplicationIds->diff($this->foundApplicationIds); $notFoundApplicationIds = $this->allApplicationIds->diff($this->foundApplicationIds);
if ($notFoundApplicationIds->isNotEmpty()) { if ($notFoundApplicationIds->isNotEmpty()) {
logger('Not found application ids', ['application_ids' => $notFoundApplicationIds]); ray('Not found application ids', ['application_ids' => $notFoundApplicationIds]);
$notFoundApplicationIds->each(function ($applicationId) { $notFoundApplicationIds->each(function ($applicationId) {
logger('Updating application status', ['application_id' => $applicationId, 'status' => 'exited']); ray('Updating application status', ['application_id' => $applicationId, 'status' => 'exited']);
$application = Application::find($applicationId); $application = Application::find($applicationId);
if ($application) { if ($application) {
$application->status = 'exited'; $application->status = 'exited';
$application->save(); $application->save();
logger('Application status updated', ['application_id' => $applicationId, 'status' => 'exited']); ray('Application status updated', ['application_id' => $applicationId, 'status' => 'exited']);
} }
}); });
} }
@@ -222,14 +225,14 @@ class PushServerUpdateJob implements ShouldQueue
{ {
$notFoundApplicationPreviewsIds = $this->allApplicationPreviewsIds->diff($this->foundApplicationPreviewsIds); $notFoundApplicationPreviewsIds = $this->allApplicationPreviewsIds->diff($this->foundApplicationPreviewsIds);
if ($notFoundApplicationPreviewsIds->isNotEmpty()) { if ($notFoundApplicationPreviewsIds->isNotEmpty()) {
logger('Not found application previews ids', ['application_previews_ids' => $notFoundApplicationPreviewsIds]); ray('Not found application previews ids', ['application_previews_ids' => $notFoundApplicationPreviewsIds]);
$notFoundApplicationPreviewsIds->each(function ($applicationPreviewId) { $notFoundApplicationPreviewsIds->each(function ($applicationPreviewId) {
logger('Updating application preview status', ['application_preview_id' => $applicationPreviewId, 'status' => 'exited']); ray('Updating application preview status', ['application_preview_id' => $applicationPreviewId, 'status' => 'exited']);
$applicationPreview = ApplicationPreview::find($applicationPreviewId); $applicationPreview = ApplicationPreview::find($applicationPreviewId);
if ($applicationPreview) { if ($applicationPreview) {
$applicationPreview->status = 'exited'; $applicationPreview->status = 'exited';
$applicationPreview->save(); $applicationPreview->save();
logger('Application preview status updated', ['application_preview_id' => $applicationPreviewId, 'status' => 'exited']); ray('Application preview status updated', ['application_preview_id' => $applicationPreviewId, 'status' => 'exited']);
} }
}); });
} }
@@ -238,9 +241,8 @@ class PushServerUpdateJob implements ShouldQueue
private function updateProxyStatus() private function updateProxyStatus()
{ {
// If proxy is not found, start it // If proxy is not found, start it
logger('Proxy not found', ['foundProxy' => $this->foundProxy, 'isProxyShouldRun' => $this->server->isProxyShouldRun()]);
if (! $this->foundProxy && $this->server->isProxyShouldRun()) { if (! $this->foundProxy && $this->server->isProxyShouldRun()) {
logger('Proxy not found, starting it.'); ray('Proxy not found, starting it.');
StartProxy::dispatch($this->server); StartProxy::dispatch($this->server);
} }
@@ -254,17 +256,16 @@ class PushServerUpdateJob implements ShouldQueue
} }
$database->status = $containerStatus; $database->status = $containerStatus;
$database->save(); $database->save();
logger('Database status updated', ['database_uuid' => $databaseUuid, 'status' => $containerStatus]); ray('Database status updated', ['database_uuid' => $databaseUuid, 'status' => $containerStatus]);
if (str($containerStatus)->contains('running') && $tcpProxy) { if ($this->isRunning($containerStatus) && $tcpProxy) {
$tcpProxyContainerFound = $this->containers->filter(function ($value, $key) use ($databaseUuid) { $tcpProxyContainerFound = $this->containers->filter(function ($value, $key) use ($databaseUuid) {
return data_get($value, 'name') === "$databaseUuid-proxy" && data_get($value, 'state') === 'running'; return data_get($value, 'name') === "$databaseUuid-proxy" && data_get($value, 'state') === 'running';
})->first(); })->first();
logger('TCP proxy container found', ['tcpProxyContainerFound' => $tcpProxyContainerFound]);
if (! $tcpProxyContainerFound) { if (! $tcpProxyContainerFound) {
logger('Starting TCP proxy for database', ['database_uuid' => $databaseUuid]); ray('Starting TCP proxy for database', ['database_uuid' => $databaseUuid]);
StartDatabaseProxy::dispatch($database); StartDatabaseProxy::dispatch($database);
} else { } else {
logger('TCP proxy for database found in containers', ['database_uuid' => $databaseUuid]); ray('TCP proxy for database found in containers', ['database_uuid' => $databaseUuid]);
} }
} }
} }
@@ -273,14 +274,19 @@ class PushServerUpdateJob implements ShouldQueue
{ {
$notFoundDatabaseUuids = $this->allDatabaseUuids->diff($this->foundDatabaseUuids); $notFoundDatabaseUuids = $this->allDatabaseUuids->diff($this->foundDatabaseUuids);
if ($notFoundDatabaseUuids->isNotEmpty()) { if ($notFoundDatabaseUuids->isNotEmpty()) {
logger('Not found database uuids', ['database_uuids' => $notFoundDatabaseUuids]); ray('Not found database uuids', ['database_uuids' => $notFoundDatabaseUuids]);
$notFoundDatabaseUuids->each(function ($databaseUuid) { $notFoundDatabaseUuids->each(function ($databaseUuid) {
logger('Updating database status', ['database_uuid' => $databaseUuid, 'status' => 'exited']); ray('Updating database status', ['database_uuid' => $databaseUuid, 'status' => 'exited']);
$database = $this->server->databases()->where('uuid', $databaseUuid)->first(); $database = $this->server->databases()->where('uuid', $databaseUuid)->first();
if ($database) { if ($database) {
$database->status = 'exited'; $database->status = 'exited';
$database->save(); $database->save();
logger('Database status updated', ['database_uuid' => $databaseUuid, 'status' => 'exited']); ray('Database status updated', ['database_uuid' => $databaseUuid, 'status' => 'exited']);
ray('Database is public', ['database_uuid' => $databaseUuid, 'is_public' => $database->is_public]);
if ($database->is_public) {
ray('Stopping TCP proxy for database', ['database_uuid' => $databaseUuid]);
StopDatabaseProxy::dispatch($database);
}
} }
}); });
} }
@@ -296,14 +302,14 @@ class PushServerUpdateJob implements ShouldQueue
$application = $service->applications()->where('id', $subId)->first(); $application = $service->applications()->where('id', $subId)->first();
$application->status = $containerStatus; $application->status = $containerStatus;
$application->save(); $application->save();
logger('Service application updated', ['service_id' => $serviceId, 'sub_type' => $subType, 'sub_id' => $subId, 'status' => $containerStatus]); ray('Service application updated', ['service_id' => $serviceId, 'sub_type' => $subType, 'sub_id' => $subId, 'status' => $containerStatus]);
} elseif ($subType === 'database') { } elseif ($subType === 'database') {
$database = $service->databases()->where('id', $subId)->first(); $database = $service->databases()->where('id', $subId)->first();
$database->status = $containerStatus; $database->status = $containerStatus;
$database->save(); $database->save();
logger('Service database updated', ['service_id' => $serviceId, 'sub_type' => $subType, 'sub_id' => $subId, 'status' => $containerStatus]); ray('Service database updated', ['service_id' => $serviceId, 'sub_type' => $subType, 'sub_id' => $subId, 'status' => $containerStatus]);
} else { } else {
logger()->warning('Unknown sub type', ['service_id' => $serviceId, 'sub_type' => $subType, 'sub_id' => $subId, 'status' => $containerStatus]); ray()->warning('Unknown sub type', ['service_id' => $serviceId, 'sub_type' => $subType, 'sub_id' => $subId, 'status' => $containerStatus]);
} }
} }
@@ -312,26 +318,26 @@ class PushServerUpdateJob implements ShouldQueue
$notFoundServiceApplicationIds = $this->allServiceApplicationIds->diff($this->foundServiceApplicationIds); $notFoundServiceApplicationIds = $this->allServiceApplicationIds->diff($this->foundServiceApplicationIds);
$notFoundServiceDatabaseIds = $this->allServiceDatabaseIds->diff($this->foundServiceDatabaseIds); $notFoundServiceDatabaseIds = $this->allServiceDatabaseIds->diff($this->foundServiceDatabaseIds);
if ($notFoundServiceApplicationIds->isNotEmpty()) { if ($notFoundServiceApplicationIds->isNotEmpty()) {
logger('Not found service application ids', ['service_application_ids' => $notFoundServiceApplicationIds]); ray('Not found service application ids', ['service_application_ids' => $notFoundServiceApplicationIds]);
$notFoundServiceApplicationIds->each(function ($serviceApplicationId) { $notFoundServiceApplicationIds->each(function ($serviceApplicationId) {
logger('Updating service application status', ['service_application_id' => $serviceApplicationId, 'status' => 'exited']); ray('Updating service application status', ['service_application_id' => $serviceApplicationId, 'status' => 'exited']);
$application = ServiceApplication::find($serviceApplicationId); $application = ServiceApplication::find($serviceApplicationId);
if ($application) { if ($application) {
$application->status = 'exited'; $application->status = 'exited';
$application->save(); $application->save();
logger('Service application status updated', ['service_application_id' => $serviceApplicationId, 'status' => 'exited']); ray('Service application status updated', ['service_application_id' => $serviceApplicationId, 'status' => 'exited']);
} }
}); });
} }
if ($notFoundServiceDatabaseIds->isNotEmpty()) { if ($notFoundServiceDatabaseIds->isNotEmpty()) {
logger('Not found service database ids', ['service_database_ids' => $notFoundServiceDatabaseIds]); ray('Not found service database ids', ['service_database_ids' => $notFoundServiceDatabaseIds]);
$notFoundServiceDatabaseIds->each(function ($serviceDatabaseId) { $notFoundServiceDatabaseIds->each(function ($serviceDatabaseId) {
logger('Updating service database status', ['service_database_id' => $serviceDatabaseId, 'status' => 'exited']); ray('Updating service database status', ['service_database_id' => $serviceDatabaseId, 'status' => 'exited']);
$database = ServiceDatabase::find($serviceDatabaseId); $database = ServiceDatabase::find($serviceDatabaseId);
if ($database) { if ($database) {
$database->status = 'exited'; $database->status = 'exited';
$database->save(); $database->save();
logger('Service database status updated', ['service_database_id' => $serviceDatabaseId, 'status' => 'exited']); ray('Service database status updated', ['service_database_id' => $serviceDatabaseId, 'status' => 'exited']);
} }
}); });
} }
@@ -340,8 +346,13 @@ class PushServerUpdateJob implements ShouldQueue
private function updateAdditionalServersStatus() private function updateAdditionalServersStatus()
{ {
$this->allApplicationsWithAdditionalServers->each(function ($application) { $this->allApplicationsWithAdditionalServers->each(function ($application) {
logger('Updating additional servers status for application', ['application_id' => $application->id]); ray('Updating additional servers status for application', ['application_id' => $application->id]);
ComplexStatusCheck::run($application); ComplexStatusCheck::run($application);
}); });
} }
private function isRunning(string $containerStatus)
{
return str($containerStatus)->contains('running');
}
} }

2
resources/views/livewire/project/service/configuration.blade.php
View File

@@ -1,4 +1,4 @@
<div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" x-init="$wire.check_status"> <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }">
<x-slot:title> <x-slot:title>
{{ data_get_str($service, 'name')->limit(10) }} > Configuration | Coolify {{ data_get_str($service, 'name')->limit(10) }} > Configuration | Coolify
</x-slot> </x-slot>