nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-01-01 03:22:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

don't crash during container removal if the container doesn't exist

Browse source 
Signed-off-by: szaimen <szaimen@e.mail.de>
This commit is contained in:
szaimen 2022-01-01 16:01:31 +01:00
parent 892590275f
commit 51d55760fa
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
php/src/Docker/DockerActionManager.php
View file

@ -125,7 +125,11 @@ class DockerActionManager
$url = $this->BuildApiUrl(sprintf('containers/%s', urlencode($container->GetIdentifier()))); $url = $this->BuildApiUrl(sprintf('containers/%s', urlencode($container->GetIdentifier())));
try { try {
$this->guzzleClient->delete($url); $this->guzzleClient->delete($url);
} catch (\Exception $e) {} } catch (ClientException $e) {
if ($e->getCode() !== 404) {
throw $e;
}
}
} }
public function GetLogs(Container $container) : string public function GetLogs(Container $container) : string
@ -426,7 +430,7 @@ class DockerActionManager
], ],
] ]
); );
} catch (ServerException $e) {} } catch (ClientException $e) {}
} }
private function ConnectContainerIdToNetwork(string $id) private function ConnectContainerIdToNetwork(string $id)
@ -482,7 +486,9 @@ class DockerActionManager
public function StopContainer(Container $container) { public function StopContainer(Container $container) {
$url = $this->BuildApiUrl(sprintf('containers/%s/stop?t=%s', urlencode($container->GetIdentifier()), $container->GetMaxShutdownTime())); $url = $this->BuildApiUrl(sprintf('containers/%s/stop?t=%s', urlencode($container->GetIdentifier()), $container->GetMaxShutdownTime()));
$this->guzzleClient->post($url); try {
$this->guzzleClient->post($url);
} catch (\Exception $e) {}
} }
public function GetBackupcontainerExitCode() : int public function GetBackupcontainerExitCode() : int