also debug http response status code
This commit is contained in:
parent
74e9e3ccf0
commit
a16e83eec8
1 changed files with 16 additions and 13 deletions
|
@ -205,19 +205,26 @@ getLFSEndpoint tro hv = do
|
||||||
LFS.RequestDownload -> downloadEndpoint
|
LFS.RequestDownload -> downloadEndpoint
|
||||||
LFS.RequestUpload -> uploadEndpoint
|
LFS.RequestUpload -> uploadEndpoint
|
||||||
|
|
||||||
|
-- makeAPIRequest :: Request -> Annex (Response t)
|
||||||
|
makeAPIRequest req = do
|
||||||
|
uo <- getUrlOptions
|
||||||
|
let req' = applyRequest uo req
|
||||||
|
liftIO $ debugM "git-lfs" (show req')
|
||||||
|
resp <- liftIO $ httpLbs req' (httpManager uo)
|
||||||
|
-- Only debug the http status code, not the json
|
||||||
|
-- which may include an authentication token.
|
||||||
|
liftIO $ debugM "git-lfs" (show $ responseStatus resp)
|
||||||
|
return resp
|
||||||
|
|
||||||
sendTransferRequest
|
sendTransferRequest
|
||||||
:: LFS.IsTransferResponseOperation op
|
:: LFS.IsTransferResponseOperation op
|
||||||
=> LFS.TransferRequest
|
=> LFS.TransferRequest
|
||||||
-> LFS.Endpoint
|
-> LFS.Endpoint
|
||||||
-> Annex (Either String (LFS.TransferResponse op))
|
-> Annex (Either String (LFS.TransferResponse op))
|
||||||
sendTransferRequest req endpoint = do
|
sendTransferRequest req endpoint =
|
||||||
uo <- getUrlOptions
|
case LFS.startTransferRequest endpoint req of
|
||||||
case applyRequest uo <$> LFS.startTransferRequest endpoint req of
|
|
||||||
Just httpreq -> do
|
Just httpreq -> do
|
||||||
liftIO $ debugM "git-lfs" (show httpreq)
|
httpresp <- makeAPIRequest $ setRequestCheckStatus httpreq
|
||||||
httpresp <- liftIO $ httpLbs
|
|
||||||
(setRequestCheckStatus httpreq)
|
|
||||||
(httpManager uo)
|
|
||||||
return $ case LFS.parseTransferResponse (responseBody httpresp) of
|
return $ case LFS.parseTransferResponse (responseBody httpresp) of
|
||||||
Left (Right tro) -> Left $
|
Left (Right tro) -> Left $
|
||||||
T.unpack $ LFS.resperr_message tro
|
T.unpack $ LFS.resperr_message tro
|
||||||
|
@ -290,12 +297,8 @@ store h = fileStorer $ \k src p -> getLFSEndpoint LFS.RequestUpload h >>= \case
|
||||||
Just op -> case LFS.uploadOperationRequests op body sha256 size of
|
Just op -> case LFS.uploadOperationRequests op body sha256 size of
|
||||||
Nothing -> giveup "unable to parse git-lfs server upload url"
|
Nothing -> giveup "unable to parse git-lfs server upload url"
|
||||||
Just [] -> noop -- server already has it
|
Just [] -> noop -- server already has it
|
||||||
Just reqs -> do
|
Just reqs -> forM_ reqs $
|
||||||
uo <- getUrlOptions
|
makeAPIRequest . setRequestCheckStatus
|
||||||
let reqs' = map (setRequestCheckStatus . applyRequest uo) reqs
|
|
||||||
liftIO $ forM_ reqs $ \r -> do
|
|
||||||
debugM "git-lfs" (show r)
|
|
||||||
httpLbs r (httpManager uo)
|
|
||||||
|
|
||||||
retrieve :: TVar LFSHandle -> Retriever
|
retrieve :: TVar LFSHandle -> Retriever
|
||||||
retrieve h = byteRetriever $ \k sink -> getLFSEndpoint LFS.RequestDownload h >>= \case
|
retrieve h = byteRetriever $ \k sink -> getLFSEndpoint LFS.RequestDownload h >>= \case
|
||||||
|
|
Loading…
Reference in a new issue