From b8752c59cdc06fb976cd5c530389ff4f9571ae58 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 18 Feb 2022 15:20:45 +0100 Subject: improve errors for external share availability check Signed-off-by: Robin Appelman --- apps/files_sharing/lib/External/Storage.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'apps/files_sharing/lib') diff --git a/apps/files_sharing/lib/External/Storage.php b/apps/files_sharing/lib/External/Storage.php index 23e5ac3ea26..ffa5fb8716d 100644 --- a/apps/files_sharing/lib/External/Storage.php +++ b/apps/files_sharing/lib/External/Storage.php @@ -222,22 +222,20 @@ class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage { // we remove the invalid storage $this->manager->removeShare($this->mountPoint); $this->manager->getMountManager()->removeMount($this->mountPoint); - throw new StorageInvalidException(); + throw new StorageInvalidException("Remote share not found", 0, $e); } else { // Nextcloud instance is gone, likely to be a temporary server configuration error - throw new StorageNotAvailableException(); + throw new StorageNotAvailableException("No nextcloud instance found at remote", 0, $e); } } catch (ForbiddenException $e) { // auth error, remove share for now (provide a dialog in the future) $this->manager->removeShare($this->mountPoint); $this->manager->getMountManager()->removeMount($this->mountPoint); - throw new StorageInvalidException(); + throw new StorageInvalidException("Auth error when getting remote share"); } catch (\GuzzleHttp\Exception\ConnectException $e) { - throw new StorageNotAvailableException(); + throw new StorageNotAvailableException("Failed to connect to remote instance", 0, $e); } catch (\GuzzleHttp\Exception\RequestException $e) { - throw new StorageNotAvailableException(); - } catch (\Exception $e) { - throw $e; + throw new StorageNotAvailableException("Error while sending request to remote instance", 0, $e); } } -- cgit v1.2.3