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/Service/DeleteService.php
View File

@@ -2,8 +2,8 @@
namespace App\Actions\Service;
use App\Models\Service;
use App\Actions\Server\CleanupDocker;
use App\Models\Service;
use Lorisleiva\Actions\Concerns\AsAction;
class DeleteService
@@ -36,7 +36,7 @@ class DeleteService
}
// Execute volume deletion first, this must be done first otherwise volumes will not be deleted.
if (!empty($commands)) {
if (! empty($commands)) {
foreach ($commands as $command) {
$result = instant_remote_process([$command], $server, false);
if ($result !== 0) {
@@ -70,7 +70,7 @@ class DeleteService
$service->forceDelete();
if ($dockerCleanup) {
CleanupDocker::run($server, true);
CleanupDocker::dispatch($server, true);
}
}
}

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

@@ -2,8 +2,8 @@
namespace App\Actions\Service;
use App\Models\Service;
use App\Actions\Server\CleanupDocker;
use App\Models\Service;
use Lorisleiva\Actions\Concerns\AsAction;
class StopService
@@ -14,21 +14,22 @@ class StopService
{
try {
$server = $service->destination->server;
if (!$server->isFunctional()) {
if (! $server->isFunctional()) {
return 'Server is not functional';
}
$containersToStop = $service->getContainersToStop();
$service->stopContainers($containersToStop, $server);
if (!$isDeleteOperation) {
if (! $isDeleteOperation) {
$service->delete_connected_networks($service->uuid);
if ($dockerCleanup) {
CleanupDocker::run($server, true);
CleanupDocker::dispatch($server, true);
}
}
} catch (\Exception $e) {
ray($e->getMessage());
return $e->getMessage();
}
}