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

Refactor PushServerUpdateJob to handle multiple servers, previews, and emails

Browse Source
This commit is contained in:
Andras Bacsai
2024-10-14 22:53:16 +02:00
parent 740419806e
commit 81db57002b
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/Jobs/PushServerUpdateJob.php
View File

@@ -28,6 +28,14 @@ class PushServerUpdateJob implements ShouldQueue
public Collection $containers; public Collection $containers;
public Collection $applications;
public Collection $previews;
public Collection $databases;
public Collection $services;
public Collection $allApplicationIds; public Collection $allApplicationIds;
public Collection $allDatabaseUuids; public Collection $allDatabaseUuids;
@@ -59,9 +67,6 @@ class PushServerUpdateJob implements ShouldQueue
public function __construct(public Server $server, public $data) public function __construct(public Server $server, public $data)
{ {
// TODO: Handle multiple servers - done - NOT TESTED
// TODO: Handle Preview deployments - done - NOT TESTED
// TODO: Emails
$this->containers = collect(); $this->containers = collect();
$this->foundApplicationIds = collect(); $this->foundApplicationIds = collect();
$this->foundDatabaseUuids = collect(); $this->foundDatabaseUuids = collect();
@@ -86,19 +91,20 @@ class PushServerUpdateJob implements ShouldQueue
if ($this->containers->isEmpty()) { if ($this->containers->isEmpty()) {
return; return;
} }
$this->allApplicationIds = $this->server->applications() $this->applications = $this->server->applications();
->filter(function ($application) { $this->databases = $this->server->databases();
$this->previews = $this->server->previews();
$this->services = $this->server->services()->get();
$this->allApplicationIds = $this->applications->filter(function ($application) {
return $application->additional_servers->count() === 0; return $application->additional_servers->count() === 0;
}) })->pluck('id');
->pluck('id'); $this->allApplicationsWithAdditionalServers = $this->applications->filter(function ($application) {
$this->allApplicationsWithAdditionalServers = $this->server->applications()
->filter(function ($application) {
return $application->additional_servers->count() > 0; return $application->additional_servers->count() > 0;
}); });
$this->allApplicationPreviewsIds = $this->server->previews()->pluck('id'); $this->allApplicationPreviewsIds = $this->previews->pluck('id');
$this->allDatabaseUuids = $this->server->databases()->pluck('uuid'); $this->allDatabaseUuids = $this->databases->pluck('uuid');
$this->allTcpProxyUuids = $this->server->databases()->where('is_public', true)->pluck('uuid'); $this->allTcpProxyUuids = $this->databases->where('is_public', true)->pluck('uuid');
$this->server->services()->each(function ($service) { $this->services->each(function ($service) {
$service->applications()->pluck('id')->each(function ($applicationId) { $service->applications()->pluck('id')->each(function ($applicationId) {
$this->allServiceApplicationIds->push($applicationId); $this->allServiceApplicationIds->push($applicationId);
}); });
@@ -184,7 +190,7 @@ class PushServerUpdateJob implements ShouldQueue
private function updateApplicationStatus(string $applicationId, string $containerStatus) private function updateApplicationStatus(string $applicationId, string $containerStatus)
{ {
$application = $this->server->applications()->where('id', $applicationId)->first(); $application = $this->applications->where('id', $applicationId)->first();
if (! $application) { if (! $application) {
return; return;
} }
@@ -195,7 +201,7 @@ class PushServerUpdateJob implements ShouldQueue
private function updateApplicationPreviewStatus(string $applicationId, string $containerStatus) private function updateApplicationPreviewStatus(string $applicationId, string $containerStatus)
{ {
$application = $this->server->previews()->where('id', $applicationId)->first(); $application = $this->previews->where('id', $applicationId)->first();
if (! $application) { if (! $application) {
return; return;
} }
@@ -250,7 +256,7 @@ class PushServerUpdateJob implements ShouldQueue
private function updateDatabaseStatus(string $databaseUuid, string $containerStatus, bool $tcpProxy = false) private function updateDatabaseStatus(string $databaseUuid, string $containerStatus, bool $tcpProxy = false)
{ {
$database = $this->server->databases()->where('uuid', $databaseUuid)->first(); $database = $this->databases->where('uuid', $databaseUuid)->first();
if (! $database) { if (! $database) {
return; return;
} }
@@ -277,7 +283,7 @@ class PushServerUpdateJob implements ShouldQueue
ray('Not found database uuids', ['database_uuids' => $notFoundDatabaseUuids]); ray('Not found database uuids', ['database_uuids' => $notFoundDatabaseUuids]);
$notFoundDatabaseUuids->each(function ($databaseUuid) { $notFoundDatabaseUuids->each(function ($databaseUuid) {
ray('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->databases->where('uuid', $databaseUuid)->first();
if ($database) { if ($database) {
$database->status = 'exited'; $database->status = 'exited';
$database->save(); $database->save();
@@ -294,7 +300,7 @@ class PushServerUpdateJob implements ShouldQueue
private function updateServiceSubStatus(string $serviceId, string $subType, string $subId, string $containerStatus) private function updateServiceSubStatus(string $serviceId, string $subType, string $subId, string $containerStatus)
{ {
$service = $this->server->services()->where('id', $serviceId)->first(); $service = $this->services->where('id', $serviceId)->first();
if (! $service) { if (! $service) {
return; return;
} }