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

Fix error handling in loadUnmanagedContainers method

Browse Source
This commit is contained in:
Andras Bacsai
2024-04-02 15:01:50 +02:00
parent 75b9f4fcbf
commit 0f4eab3cf2
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Livewire/Server/Resources.php
View File

@@ -42,7 +42,11 @@ class Resources extends Component
$this->dispatch('success', 'Resource statuses refreshed.'); $this->dispatch('success', 'Resource statuses refreshed.');
} }
public function loadUnmanagedContainers() { public function loadUnmanagedContainers() {
try {
$this->unmanagedContainers = $this->server->loadUnmanagedContainers(); $this->unmanagedContainers = $this->server->loadUnmanagedContainers();
} catch (\Throwable $e) {
return handleError($e, $this);
}
} }
public function mount() { public function mount() {
$this->unmanagedContainers = collect(); $this->unmanagedContainers = collect();

5
app/Models/Server.php
View File

@@ -550,7 +550,6 @@ $schema://$host {
} }
public function loadUnmanagedContainers() public function loadUnmanagedContainers()
{ {
try {
if ($this->isFunctional()) { if ($this->isFunctional()) {
$containers = instant_remote_process(["docker ps -a --format '{{json .}}' "], $this); $containers = instant_remote_process(["docker ps -a --format '{{json .}}' "], $this);
$containers = format_docker_command_output_to_json($containers); $containers = format_docker_command_output_to_json($containers);
@@ -566,10 +565,6 @@ $schema://$host {
} else { } else {
return collect([]); return collect([]);
} }
} catch (\Throwable $e) {
return handleError($e);
}
} }
public function hasDefinedResources() public function hasDefinedResources()
{ {