Skip to content

Fix hook error handling #241

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
merged 2 commits into from
Jul 22, 2024
Merged

Fix hook error handling #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e5bf52
ObjectsRendererHook: Catch not just exceptions..
nilmerg Jul 19, 2024
05a668f
run.php: Don't provide the builtin icingadb hook..
nilmerg Jul 19, 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
6 changes: 3 additions & 3 deletions library/Notifications/Hook/ObjectsRendererHook.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace Icinga\Module\Notifications\Hook;

use Exception;
use Generator;
use Icinga\Application\Hook;
use Icinga\Application\Logger;
Expand All @@ -16,6 +15,7 @@
use ipl\Html\ValidHtml;
use ipl\Web\Url;
use ipl\Web\Widget\Link;
use Throwable;

/**
* Base hook to prepare and render objects
Expand Down Expand Up @@ -178,7 +178,7 @@ function ($object) {
}
}
}
} catch (Exception $e) {
} catch (Throwable $e) {
Logger::error('Failed to load hook %s:', get_class($hook), $e);
}
}
Expand Down Expand Up @@ -289,7 +289,7 @@ final public static function renderObjectLink(Objects $object): ?ValidHtml
]
]);
}
} catch (Exception $e) {
} catch (Throwable $e) {
Logger::error('Failed to load hook %s:', get_class($hook), $e);
}
}
Expand Down
5 changes: 4 additions & 1 deletion run.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@

/** @var \Icinga\Application\Modules\Module $this */

$this->provideHook('Notifications/ObjectsRenderer');
if ($this::exists('icingadb')) {
$this->provideHook('Notifications/ObjectsRenderer');
}

$this->provideHook('authentication', 'SessionStorage', true);
$this->addRoute(
'static-file',
Expand Down