From 15054715d68737957763d04c8fea08c57305b71c Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 9 May 2024 13:10:48 +0200 Subject: fix(users/Profpatsch/whatcd-resolver): always use good html renderer The pretty renderer would add extra newlines, making the html different. Change-Id: I28496cbec61d4c9c63f657a499a1990f891949ee Reviewed-on: https://cl.tvl.fyi/c/depot/+/11639 Reviewed-by: Profpatsch Tested-by: BuildkiteCI Autosubmit: Profpatsch --- users/Profpatsch/whatcd-resolver/src/WhatcdResolver.hs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'users/Profpatsch/whatcd-resolver') diff --git a/users/Profpatsch/whatcd-resolver/src/WhatcdResolver.hs b/users/Profpatsch/whatcd-resolver/src/WhatcdResolver.hs index ee1879b412..054728cb9d 100644 --- a/users/Profpatsch/whatcd-resolver/src/WhatcdResolver.hs +++ b/users/Profpatsch/whatcd-resolver/src/WhatcdResolver.hs @@ -55,7 +55,6 @@ import System.Directory qualified as Xdg import System.Environment qualified as Env import System.FilePath (()) import Text.Blaze.Html (Html) -import Text.Blaze.Html.Renderer.Pretty qualified as Html.Pretty import Text.Blaze.Html.Renderer.Utf8 qualified as Html import Text.Blaze.Html5 qualified as Html import Tool (readTool, readTools) @@ -313,10 +312,6 @@ runHandlers :: (Wai.Response -> IO ResponseReceived) -> m ResponseReceived runHandlers debug defaultHandler handlers req respond = withRunInIO $ \runInIO -> do - let renderHtml = - if debug - then Html.Pretty.renderHtml >>> stringToText >>> textToBytesUtf8 >>> toLazyBytes - else Html.renderHtml let hh route act = Otel.inSpan' [fmt|Route {route}|] @@ -329,7 +324,7 @@ runHandlers debug defaultHandler handlers req respond = withRunInIO $ \runInIO - ) ( \span -> do res <- act span - liftIO $ respond . Wai.responseLBS Http.ok200 ([("Content-Type", "text/html")] <> res.extraHeaders) . renderHtml $ res.html + liftIO $ respond . Wai.responseLBS Http.ok200 ([("Content-Type", "text/html")] <> res.extraHeaders) . Html.renderHtml $ res.html ) let h route act = hh route (\span -> act span <&> (\html -> T2 (label @"html" html) (label @"extraHeaders" []))) -- cgit 1.4.1