Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: catch all errors when getting rich workspace content #6243

Merged
merged 1 commit into from
Aug 22, 2024

Conversation

icewind1991
Copy link
Member

Don't let errors to load a single file become errors for loading the entire directory.

@icewind1991
Copy link
Member Author

/backport to stable29

@icewind1991
Copy link
Member Author

/backport to stable28

@@ -96,7 +96,7 @@ public function propFind(PropFind $propFind, INode $node) {
try {
$cachedContent = $file->getContent();
$cache->set($cacheKey, $cachedContent, 3600);
} catch (GenericFileException|NotPermittedException|LockedException $e) {
} catch (\Exception $e) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: shall we log this, at least with debug level?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can make the changes

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to still ignore file, permission and locking exception but log anything else as error

Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@skjnldsv skjnldsv mentioned this pull request Aug 22, 2024
44 tasks
@juliushaertl juliushaertl merged commit 6e7b347 into main Aug 22, 2024
58 of 63 checks passed
@juliushaertl juliushaertl deleted the dav-workspace-catch-more branch August 22, 2024 08:04
@juliushaertl
Copy link
Member

/backport to stable30

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants