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

chore: Refactor DockerCleanupJob to remove unused middleware and uniqueId method

Browse Source
This commit is contained in:
Andras Bacsai
2024-09-23 12:10:46 +02:00
parent 960f970822
commit 04e504bb8b
5 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Actions/Application/StopApplication.php
View File

@@ -2,8 +2,8 @@
namespace App\Actions\Application; namespace App\Actions\Application;
use App\Models\Application;
use App\Actions\Server\CleanupDocker; use App\Actions\Server\CleanupDocker;
use App\Models\Application;
use Lorisleiva\Actions\Concerns\AsAction; use Lorisleiva\Actions\Concerns\AsAction;
class StopApplication class StopApplication
@@ -21,6 +21,7 @@ class StopApplication
if ($server->isSwarm()) { if ($server->isSwarm()) {
instant_remote_process(["docker stack rm {$application->uuid}"], $server); instant_remote_process(["docker stack rm {$application->uuid}"], $server);
return; return;
} }
@@ -32,10 +33,11 @@ class StopApplication
} }
if ($dockerCleanup) { if ($dockerCleanup) {
CleanupDocker::run($server, true); CleanupDocker::dispatch($server, true);
} }
} catch (\Exception $e) { } catch (\Exception $e) {
ray($e->getMessage()); ray($e->getMessage());
return $e->getMessage(); return $e->getMessage();
} }
} }

2
app/Actions/Database/StopDatabase.php
View File

@@ -28,7 +28,7 @@ class StopDatabase
$this->stopContainer($database, $database->uuid, 300); $this->stopContainer($database, $database->uuid, 300);
if (! $isDeleteOperation) { if (! $isDeleteOperation) {
if ($dockerCleanup) { if ($dockerCleanup) {
CleanupDocker::run($server, true); CleanupDocker::dispatch($server, true);
} }
} }

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

@@ -2,8 +2,8 @@
namespace App\Actions\Service; namespace App\Actions\Service;
use App\Models\Service;
use App\Actions\Server\CleanupDocker; use App\Actions\Server\CleanupDocker;
use App\Models\Service;
use Lorisleiva\Actions\Concerns\AsAction; use Lorisleiva\Actions\Concerns\AsAction;
class DeleteService class DeleteService
@@ -70,7 +70,7 @@ class DeleteService
$service->forceDelete(); $service->forceDelete();
if ($dockerCleanup) { if ($dockerCleanup) {
CleanupDocker::run($server, true); CleanupDocker::dispatch($server, true);
} }
} }
} }

5
app/Actions/Service/StopService.php
View File

@@ -2,8 +2,8 @@
namespace App\Actions\Service; namespace App\Actions\Service;
use App\Models\Service;
use App\Actions\Server\CleanupDocker; use App\Actions\Server\CleanupDocker;
use App\Models\Service;
use Lorisleiva\Actions\Concerns\AsAction; use Lorisleiva\Actions\Concerns\AsAction;
class StopService class StopService
@@ -24,11 +24,12 @@ class StopService
if (! $isDeleteOperation) { if (! $isDeleteOperation) {
$service->delete_connected_networks($service->uuid); $service->delete_connected_networks($service->uuid);
if ($dockerCleanup) { if ($dockerCleanup) {
CleanupDocker::run($server, true); CleanupDocker::dispatch($server, true);
} }
} }
} catch (\Exception $e) { } catch (\Exception $e) {
ray($e->getMessage()); ray($e->getMessage());
return $e->getMessage(); return $e->getMessage();
} }
} }

4
app/Jobs/DeleteResourceJob.php
View File

@@ -80,7 +80,7 @@ class DeleteResourceJob implements ShouldBeEncrypted, ShouldQueue
|| $this->resource instanceof StandaloneClickhouse; || $this->resource instanceof StandaloneClickhouse;
$server = data_get($this->resource, 'server') ?? data_get($this->resource, 'destination.server'); $server = data_get($this->resource, 'server') ?? data_get($this->resource, 'destination.server');
if (($this->dockerCleanup || $isDatabase) && $server) { if (($this->dockerCleanup || $isDatabase) && $server) {
CleanupDocker::run($server, true); CleanupDocker::dispatch($server, true);
} }
if ($this->deleteConnectedNetworks && ! $isDatabase) { if ($this->deleteConnectedNetworks && ! $isDatabase) {
@@ -92,7 +92,7 @@ class DeleteResourceJob implements ShouldBeEncrypted, ShouldQueue
} finally { } finally {
$this->resource->forceDelete(); $this->resource->forceDelete();
if ($this->dockerCleanup) { if ($this->dockerCleanup) {
CleanupDocker::run($server, true); CleanupDocker::dispatch($server, true);
} }
Artisan::queue('cleanup:stucked-resources'); Artisan::queue('cleanup:stucked-resources');
} }