Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Refactor service and resource deletion logic

Browse Source
This commit is contained in:
Andras Bacsai 2024-01-30 17:38:07 +01:00
parent cc641d8cba
commit 795c8abf64
3 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Actions/Service/DeleteService.php
View File

@ -10,10 +10,10 @@ class DeleteService
use AsAction; use AsAction;
public function handle(Service $service) public function handle(Service $service)
{ {
try {
$server = data_get($service, 'server'); $server = data_get($service, 'server');
if ($server->isFunctional()) { if ($server->isFunctional()) {
StopService::run($service); StopService::run($service);
}
$storagesToDelete = collect([]); $storagesToDelete = collect([]);
$service->environment_variables()->delete(); $service->environment_variables()->delete();
@ -23,16 +23,13 @@ class DeleteService
foreach ($storages as $storage) { foreach ($storages as $storage) {
$storagesToDelete->push($storage); $storagesToDelete->push($storage);
} }
$application->forceDelete();
} }
foreach ($service->databases()->get() as $database) { foreach ($service->databases()->get() as $database) {
$storages = $database->persistentStorages()->get(); $storages = $database->persistentStorages()->get();
foreach ($storages as $storage) { foreach ($storages as $storage) {
$storagesToDelete->push($storage); $storagesToDelete->push($storage);
} }
$database->forceDelete();
} }
if ($server->isFunctional()) {
foreach ($storagesToDelete as $storage) { foreach ($storagesToDelete as $storage) {
$commands[] = "docker volume rm -f $storage->name"; $commands[] = "docker volume rm -f $storage->name";
} }
@ -40,6 +37,16 @@ class DeleteService
instant_remote_process($commands, $server, false); instant_remote_process($commands, $server, false);
} }
} catch (\Exception $e) {
throw new \Exception($e->getMessage());
} finally {
foreach ($service->applications()->get() as $application) {
$application->forceDelete();
}
foreach ($service->databases()->get() as $database) {
$database->forceDelete();
}
$service->forceDelete(); $service->forceDelete();
} }
}
} }

9
app/Jobs/DeleteResourceJob.php
View File

@ -30,25 +30,30 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
public function handle() public function handle()
{ {
try { try {
$this->resource->delete();
switch ($this->resource->type()) { switch ($this->resource->type()) {
case 'application': case 'application':
StopApplication::run($this->resource); StopApplication::run($this->resource);
$this->resource->forceDelete();
break; break;
case 'standalone-postgresql': case 'standalone-postgresql':
StopDatabase::run($this->resource); StopDatabase::run($this->resource);
$this->resource->forceDelete();
break; break;
case 'standalone-redis': case 'standalone-redis':
StopDatabase::run($this->resource); StopDatabase::run($this->resource);
$this->resource->forceDelete();
break; break;
case 'standalone-mongodb': case 'standalone-mongodb':
StopDatabase::run($this->resource); StopDatabase::run($this->resource);
$this->resource->forceDelete();
break; break;
case 'standalone-mysql': case 'standalone-mysql':
StopDatabase::run($this->resource); StopDatabase::run($this->resource);
$this->resource->forceDelete();
break; break;
case 'standalone-mariadb': case 'standalone-mariadb':
StopDatabase::run($this->resource); StopDatabase::run($this->resource);
$this->resource->forceDelete();
break; break;
case 'service': case 'service':
DeleteService::dispatch($this->resource); DeleteService::dispatch($this->resource);
@ -57,8 +62,6 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
} catch (\Throwable $e) { } catch (\Throwable $e) {
send_internal_notification('ContainerStoppingJob failed with: ' . $e->getMessage()); send_internal_notification('ContainerStoppingJob failed with: ' . $e->getMessage());
throw $e; throw $e;
} finally {
$this->resource->forceDelete();
} }
} }
} }

3
app/Livewire/Project/Shared/Danger.php
View File

@ -24,7 +24,8 @@ class Danger extends Component
public function delete() public function delete()
{ {
try { try {
DeleteResourceJob::dispatchSync($this->resource); $this->resource->delete();
DeleteResourceJob::dispatch($this->resource);
return redirect()->route('project.resource.index', [ return redirect()->route('project.resource.index', [
'project_uuid' => $this->projectUuid, 'project_uuid' => $this->projectUuid,
'environment_name' => $this->environmentName 'environment_name' => $this->environmentName