aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2022-06-08 10:16:51 +0200
committerGitHub <noreply@github.com>2022-06-08 10:16:51 +0200
commit9a8c9e5cf6276fc4cbb78d5afa86b8a0fb451597 (patch)
treee70ab6e653d7f423215db6a7692775fac3ce5f6d
parentc9bee7e3092e9c1365ec65368651912f478ed406 (diff)
parent1cc2796613808dac5a2b444fc313b6a9fab0798b (diff)
downloadnextcloud-server-9a8c9e5cf6276fc4cbb78d5afa86b8a0fb451597.tar.gz
nextcloud-server-9a8c9e5cf6276fc4cbb78d5afa86b8a0fb451597.zip
Merge pull request #32744 from nextcloud/bugfix/noid/easier-federation-debugging
Always log errors from sending federation api requests to ease debugging
-rw-r--r--apps/cloud_federation_api/lib/Controller/RequestHandlerController.php1
-rw-r--r--lib/private/Federation/CloudFederationProviderManager.php3
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php b/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php
index 02105fb3f9c..53448119af3 100644
--- a/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php
+++ b/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php
@@ -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
diff --git a/lib/private/Federation/CloudFederationProviderManager.php b/lib/private/Federation/CloudFederationProviderManager.php
index c25d4a40363..f077e36d97d 100644
--- a/lib/private/Federation/CloudFederationProviderManager.php
+++ b/lib/private/Federation/CloudFederationProviderManager.php
@@ -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;
}
}