From 4a843fe30e35f346ffbe5c0337d69bf319cfeced Mon Sep 17 00:00:00 2001
From: Steffen Jost <s.jost@fraport.de>
Date: Tue, 6 Feb 2024 10:48:54 +0000
Subject: [PATCH] refactor(health): simplfy code following HealthR handler

---
 src/Handler/Health/Interface.hs | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/Handler/Health/Interface.hs b/src/Handler/Health/Interface.hs
index 1b6ee1dee..87be63b89 100644
--- a/src/Handler/Health/Interface.hs
+++ b/src/Handler/Health/Interface.hs
@@ -68,28 +68,25 @@ matchesUniqueInterfaceHealth (UniqueInterfaceHealth ai as aw) (UniqueInterfaceHe
 
 
 getHealthInterfaceR :: [Text] -> Handler TypedContent
-getHealthInterfaceR (dropWhile (=="force") -> ris) = do              -- for backwards compatibility we ignore leading "force"
+getHealthInterfaceR (dropWhile (=="force") -> ris) = do               -- for backwards compatibility we ignore leading "force"
   let interfs = splitInterfaces $ identifyInterfaces ris
   (missing, allok, res, iltable) <- runInterfaceLogTable interfs
-  when missing notFound -- send 404 if any requested interface was not found
-  let respond  = sendResponseStatus (bool internalServerError500 status200 allok)
-      plainMsg = if allok 
-                    then "Interfaces are healthy" 
-                    else "Unhealthy interfaces: " <> Text.intercalate ", " [iface | (iface, False) <- res]
-  selectRep $ do 
-    provideRep $ do
-      content <- siteLayoutMsg MsgMenuHealthInterface $ do
+  when missing notFound                                               -- send 404 if any requested interface was not found
+  let ihstatus = if allok then status200 
+                          else internalServerError500
+      plainMsg = if allok then "Interfaces are healthy." 
+                          else "Unhealthy interfaces: " <> Text.intercalate ", " [iface | (iface, False) <- res]
+  sendResponseStatus ihstatus <=< selectRep $ do 
+    provideRep . siteLayoutMsg MsgMenuHealthInterface $ do
       setTitleI MsgMenuHealthInterface
       [whamlet|
         <div>
           #{plainMsg}
         <div>
           ^{iltable}
-      |]
-      respond content
+      |]      
     
-    provideRep $ do 
-      respond $ RepPlain $ toContent plainMsg
+    provideRep $ return $ RepPlain $ toContent plainMsg