diff options
| author | Profpatsch <mail@profpatsch.de> | 2024-08-04T09·14+0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2024-08-06T09·59+0000 |
| commit | 37b2c2ce7892487b1c31d6ad3f7988841014ba89 (patch) | |
| tree | 00f4a4eac054c331f7a08781e6bc5a211522b7f3 /users/Profpatsch/whatcd-resolver/src/Redacted.hs | |
| parent | 8908fd18ca1603a24b234f9e1a01375dddf0b39b (diff) | |
refactor(users/Profpatsch/whatcd-resolver): continue http r/8445
Ideally there’d be a better generic abstraction of doing basic http calls (with tracing) in the future, but for now just reexport. Change-Id: Id7548739ea62e9172f2773f8db79fe726096b7f1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12136 Tested-by: BuildkiteCI Reviewed-by: Profpatsch <mail@profpatsch.de>
Diffstat (limited to 'users/Profpatsch/whatcd-resolver/src/Redacted.hs')
| -rw-r--r-- | users/Profpatsch/whatcd-resolver/src/Redacted.hs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/users/Profpatsch/whatcd-resolver/src/Redacted.hs b/users/Profpatsch/whatcd-resolver/src/Redacted.hs index 0c9506e57e1e..2979b4400a2d 100644 --- a/users/Profpatsch/whatcd-resolver/src/Redacted.hs +++ b/users/Profpatsch/whatcd-resolver/src/Redacted.hs @@ -19,8 +19,6 @@ import Http qualified import Json qualified import Label import MyPrelude -import Network.HTTP.Client.Conduit qualified as Http -import Network.HTTP.Simple qualified as Http import Network.HTTP.Types import Network.Wai.Parse qualified as Wai import OpenTelemetry.Trace qualified as Otel hiding (getTracer, inSpan, inSpan') @@ -503,17 +501,17 @@ httpTorrent span req = >>= assertM span ( \resp -> do - let statusCode = resp & Http.responseStatus & (.statusCode) + let statusCode = resp & Http.getResponseStatus & (.statusCode) contentType = resp - & Http.responseHeaders + & Http.getResponseHeaders & List.lookup "content-type" <&> Wai.parseContentType <&> (\(ct, _mimeAttributes) -> ct) if | statusCode == 200, Just "application/x-bittorrent" <- contentType -> - Right $ (resp & Http.responseBody) + Right $ (resp & Http.getResponseBody) | statusCode == 200, Just otherType <- contentType -> Left [fmt|Redacted returned a non-torrent body, with content-type "{otherType}"|] |