Fix hook error handling (#241)

Icinga · Jul 22, 2024 · 9cf10a4 · 9cf10a4
2 parents c2654c8 + 05a668f
commit 9cf10a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/library/Notifications/Hook/ObjectsRendererHook.php b/library/Notifications/Hook/ObjectsRendererHook.php
@@ -4,7 +4,6 @@
 
 namespace Icinga\Module\Notifications\Hook;
 
-use Exception;
 use Generator;
 use Icinga\Application\Hook;
 use Icinga\Application\Logger;
@@ -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
@@ -178,7 +178,7 @@ function ($object) {
                             }
                         }
                     }
-                } catch (Exception $e) {
+                } catch (Throwable $e) {
                     Logger::error('Failed to load hook %s:', get_class($hook), $e);
                 }
             }
@@ -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);
             }
         }

diff --git a/run.php b/run.php
@@ -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',