From 774928bcbe060355f6dfe6003cdb741f5f367d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 3 Jun 2025 09:35:23 +0200 Subject: [PATCH 1/2] fix(files_versions): Log failure to compute node path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To avoid hidden bugs, add some debug logging when a node path cannot be computed from a received event, to have more information for debugging Signed-off-by: Côme Chilliet --- .../lib/Listener/FileEventsListener.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/apps/files_versions/lib/Listener/FileEventsListener.php b/apps/files_versions/lib/Listener/FileEventsListener.php index 6a2e82002dee2..e0db484cd9443 100644 --- a/apps/files_versions/lib/Listener/FileEventsListener.php +++ b/apps/files_versions/lib/Listener/FileEventsListener.php @@ -443,6 +443,24 @@ private function getPathForNode(Node $node): ?string { } } + try { + $this->logger->debug('Failed to compute path for node', [ + 'node' => [ + 'path' => $node->getPath(), + 'owner' => $owner, + 'fileid' => $node->getId(), + 'size' => $node->getSize(), + 'mtime' => $node->getMTime(), + ] + ]); + } catch (NotFoundException) { + $this->logger->debug('Failed to compute path for node', [ + 'node' => [ + 'path' => $node->getPath(), + 'owner' => $owner, + ] + ]); + } return null; } } From af7e6c1598412c1efdc438eab23b951e733f6508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 17 Jun 2025 16:25:45 +0200 Subject: [PATCH 2/2] chore: Use an if/else instead of the try/catch to make meaning more obvious MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- apps/files_versions/lib/Listener/FileEventsListener.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/files_versions/lib/Listener/FileEventsListener.php b/apps/files_versions/lib/Listener/FileEventsListener.php index e0db484cd9443..d5c60dd93434d 100644 --- a/apps/files_versions/lib/Listener/FileEventsListener.php +++ b/apps/files_versions/lib/Listener/FileEventsListener.php @@ -12,6 +12,7 @@ use OC\Files\Filesystem; use OC\Files\Mount\MoveableMount; use OC\Files\Node\NonExistingFile; +use OC\Files\Node\NonExistingFolder; use OC\Files\View; use OCA\Files_Versions\Storage; use OCA\Files_Versions\Versions\INeedSyncVersionBackend; @@ -443,7 +444,7 @@ private function getPathForNode(Node $node): ?string { } } - try { + if (!($node instanceof NonExistingFile) && !($node instanceof NonExistingFolder)) { $this->logger->debug('Failed to compute path for node', [ 'node' => [ 'path' => $node->getPath(), @@ -453,7 +454,7 @@ private function getPathForNode(Node $node): ?string { 'mtime' => $node->getMTime(), ] ]); - } catch (NotFoundException) { + } else { $this->logger->debug('Failed to compute path for node', [ 'node' => [ 'path' => $node->getPath(),