mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(users/Profpatsch/whatcd-resolver): inline hh

Browse source 
Change-Id: I70ea1d7cb17e7ac7bf63be86b79d2f0b79586912
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11646
Autosubmit: Profpatsch <mail@profpatsch.de>
Reviewed-by: Profpatsch <mail@profpatsch.de>
Tested-by: BuildkiteCI
This commit is contained in:
Profpatsch 2024-05-11 20:45:26 +02:00 committed by clbot
parent d119d07aaa
commit 8a6f12bdb9
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
users/Profpatsch/whatcd-resolver/src/WhatcdResolver.hs
View file

@ -312,13 +312,17 @@ runHandlers ::
(Wai.Response -> IO ResponseReceived) -> (Wai.Response -> IO ResponseReceived) ->
m ResponseReceived m ResponseReceived
runHandlers defaultHandler handlers req respond = withRunInIO $ \runInIO -> do runHandlers defaultHandler handlers req respond = withRunInIO $ \runInIO -> do
let hh route act = let path = [fmt|/{req & Wai.pathInfo & Text.intercalate "/"}|]
let handlerResponses =
( HandlerResponses
{ plain = (\m -> liftIO $ runInIO m >>= respond),
html = \act ->
Otel.inSpan' Otel.inSpan'
[fmt|Route {route}|] [fmt|Route {path}|]
( Otel.defaultSpanArguments ( Otel.defaultSpanArguments
{ Otel.attributes = { Otel.attributes =
HashMap.fromList HashMap.fromList
[ ("server.path", Otel.toAttribute @Text route) [ ("server.path", Otel.toAttribute @Text path)
] ]
} }
) )
@ -326,12 +330,6 @@ runHandlers defaultHandler handlers req respond = withRunInIO $ \runInIO -> do
res <- act span <&> (\html -> T2 (label @"html" html) (label @"extraHeaders" [])) res <- act span <&> (\html -> T2 (label @"html" html) (label @"extraHeaders" []))
liftIO $ respond . Wai.responseLBS Http.ok200 ([("Content-Type", "text/html")] <> res.extraHeaders) . Html.renderHtml $ res.html liftIO $ respond . Wai.responseLBS Http.ok200 ([("Content-Type", "text/html")] <> res.extraHeaders) . Html.renderHtml $ res.html
) )
let path = [fmt|/{req & Wai.pathInfo & Text.intercalate "/"}|]
let handlerResponses =
( HandlerResponses
{ html = hh path,
plain = (\m -> liftIO $ runInIO m >>= respond)
} }
) )
let handler = let handler =