Skip to content

Commit

Permalink
Merge pull request #47853 from nextcloud/clearify-swift-exception
Browse files Browse the repository at this point in the history
fix: make swift connect exception message more informative
  • Loading branch information
icewind1991 authored Sep 10, 2024
2 parents 0858ff7 + 508d8e7 commit a7eaed7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/private/Files/ObjectStore/SwiftFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,13 @@ private function auth($authService, string $cacheKey) {
} catch (ClientException $e) {
$statusCode = $e->getResponse()->getStatusCode();
if ($statusCode === 404) {
throw new StorageAuthException('Keystone not found, verify the keystone url', $e);
throw new StorageAuthException('Keystone not found while connecting to object storage, verify the keystone url', $e);
} elseif ($statusCode === 412) {
throw new StorageAuthException('Precondition failed, verify the keystone url', $e);
throw new StorageAuthException('Precondition failed while connecting to object storage, verify the keystone url', $e);
} elseif ($statusCode === 401) {
throw new StorageAuthException('Authentication failed, verify the username, password and possibly tenant', $e);
throw new StorageAuthException('Authentication failed while connecting to object storage, verify the username, password and possibly tenant', $e);
} else {
throw new StorageAuthException('Unknown error', $e);
throw new StorageAuthException('Unknown error while connecting to object storage', $e);
}
} catch (RequestException $e) {
throw new StorageAuthException('Connection reset while connecting to keystone, verify the keystone url', $e);
Expand Down

0 comments on commit a7eaed7

Please sign in to comment.