From 2caa5aec5b44ceceb90846baf8ea05331daf30b7 Mon Sep 17 00:00:00 2001 From: Steffen Date: Mon, 8 Jul 2024 15:34:19 +0200 Subject: [PATCH] chore(health): add option to mark certain interface health checks to remain indefinitely --- models/audit.model | 2 +- src/Handler/Health/Interface.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/audit.model b/models/audit.model index e61f11389..8a372cd3b 100644 --- a/models/audit.model +++ b/models/audit.model @@ -26,7 +26,7 @@ InterfaceHealth interface Text subtype Text Maybe write Bool Maybe - hours Int + hours Int -- negative number: never expires, i.e. if the last entry is a success, this remains indefinitely UniqueInterfaceHealth interface subtype write !force -- Note that nullable fields must be either empty or unique deriving Eq Read Show Generic diff --git a/src/Handler/Health/Interface.hs b/src/Handler/Health/Interface.hs index 7dbc96932..3e96511d5 100644 --- a/src/Handler/Health/Interface.hs +++ b/src/Handler/Health/Interface.hs @@ -157,7 +157,7 @@ mkInterfaceLogTable flagError interfs@(reqIfs, banIfs) = do logtime = row ^. resultILog . _interfaceLogTime success = row ^. resultILog . _interfaceLogSuccess iface = row ^. resultILog . _interfaceLogInterface - status = success && now <= addHours hours logtime + status = success && (hours < 0 || now <= addHours hours logtime) in tellCell [(iface,status)] $ wgtCell $ flagError status , sortable (Just "interface") (i18nCell MsgInterfaceName ) $ \(view (resultILog . _interfaceLogInterface) -> n) -> textCell n