Skip to content

fix(setupcheck): Catch Throwables from setup checks and show them to the admin #44270

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
Altahrim merged 2 commits into from
Mar 26, 2024
Merged

fix(setupcheck): Catch Throwables from setup checks and show them to the admin #44270

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0a957c
fix(setupcheck): Catch Throwables from setup checks and show them to …
come-nc Mar 18, 2024
0ea2913
fix: Log exceptions thrown by setup checks
come-nc Mar 25, 2024
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
7 changes: 6 additions & 1 deletion lib/private/SetupCheck/SetupCheckManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
use OCP\Server;
use OCP\SetupCheck\ISetupCheck;
use OCP\SetupCheck\ISetupCheckManager;
use OCP\SetupCheck\SetupResult;
use Psr\Log\LoggerInterface;

class SetupCheckManager implements ISetupCheckManager {
Expand All @@ -46,7 +47,11 @@ public function runAll(): array {
/** @var ISetupCheck $setupCheckObject */
$setupCheckObject = Server::get($setupCheck->getService());
$this->logger->debug('Running check '.get_class($setupCheckObject));
$setupResult = $setupCheckObject->run();
try {
$setupResult = $setupCheckObject->run();
} catch (\Throwable $t) {
$setupResult = SetupResult::error("An exception occured while running the setup check:\n$t");
}
$setupResult->setName($setupCheckObject->getName());
$category = $setupCheckObject->getCategory();
$results[$category] ??= [];
Expand Down