upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-29 01:50:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 51

Merge pull request #32744 from nextcloud/bugfix/noid/easier-federation-debugging

Browse source 
Always log errors from sending federation api requests to ease debugging
This commit is contained in:
Joas Schilling 2022-06-08 10:16:51 +02:00 committed by GitHub
commit 9a8c9e5cf6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/cloud_federation_api/lib/Controller/RequestHandlerController.php
View file

@ -199,6 +199,7 @@ class RequestHandlerController extends Controller {
$e->getCode()
);
} catch (\Exception $e) {
$this->logger->error($e->getMessage(), ['exception' => $e]);
return new JSONResponse(
['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
Http::STATUS_BAD_REQUEST

3
lib/private/Federation/CloudFederationProviderManager.php
View file

@ -150,11 +150,12 @@ class CloudFederationProviderManager implements ICloudFederationProviderManager
return (is_array($result)) ? $result : [];
}
} catch (\Exception $e) {
$this->logger->debug($e->getMessage(), ['exception' => $e]);
// if flat re-sharing is not supported by the remote server
// we re-throw the exception and fall back to the old behaviour.
// (flat re-shares has been introduced in Nextcloud 9.1)
if ($e->getCode() === Http::STATUS_INTERNAL_SERVER_ERROR) {
$this->logger->debug($e->getMessage(), ['exception' => $e]);
throw $e;
}
}