Merge pull request #32751 from nextcloud/backport/32744/stable23

[stable23] Always log errors from sending federation api requests to ease debugging
nextcloud · Aug 30, 2022 · 67ec2f4 · 67ec2f4
2 parents 1e80b33 + 5d9f564
commit 67ec2f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php b/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php
@@ -203,6 +203,7 @@ public function addShare($shareWith, $name, $description, $providerId, $owner, $
 				$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
@@ -152,11 +152,12 @@ public function sendShare(ICloudFederationShare $share) {
 				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());
 				throw $e;
 			}
 		}