Skip to content

Add catch for RuntimeException #15606

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.

Sign up for GitHub

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

Merged
rullzer merged 2 commits into from
Jul 16, 2019
Merged

Add catch for RuntimeException #15606

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b693487
Add catch for RuntimeException
kesselb May 17, 2019
cbecc1f
Log RuntimeException in CleanupCardDAVPhotoCache
MorrisJobke Jul 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add catch for RuntimeException 
getDirectoryListing can throw a NotFoundException or a RuntimeException.
The repair step should be skipped if the cache directory is missing so
a catch for both exceptions is required.

Signed-off-by: Daniel Kesselberg <[email protected]>
  • Loading branch information
@kesselb
kesselb committed May 17, 2019
commit b693487d64f088969e94ade99cfab8bd3dd7d6b0
3 changes: 2 additions & 1 deletion lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
use OCP\ILogger;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;
use RuntimeException;

/**
* Class CleanupCardDAVPhotoCache
Expand Down Expand Up @@ -63,7 +64,7 @@ public function getName(): string {
private function repair(IOutput $output): void {
try {
$folders = $this->appData->getDirectoryListing();
} catch (NotFoundException $e) {
} catch (NotFoundException|RuntimeException $e) {
Copy link
Member

@MorrisJobke MorrisJobke May 21, 2019

Choose a reason for hiding this comment

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

Problem with this is that this is now not logged anymore 🙈

Copy link
Member

@rullzer rullzer May 21, 2019

Choose a reason for hiding this comment

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

Yep. Please catch is separataly and log it for easier debugging

Copy link
Contributor Author

@kesselb kesselb May 21, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

I'm not against it but that looks like the wrong place. If the permissions for appdata are broken we should prevent the upgrade and show a warning. Doing this inside a repair job sounds wrong to me.

Copy link
Member

@MorrisJobke MorrisJobke Jul 15, 2019

Choose a reason for hiding this comment

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

Still it should be logged. Let me add it.

Copy link
Contributor Author

@kesselb kesselb Jul 15, 2019

Choose a reason for hiding this comment

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

Ok 🤷‍♂️

return;
}

Expand Down