nrabulinski/attic
1
1
Fork 1
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #137 from cole-h/log-stream-errors

Browse source 
Log stream errors
This commit is contained in:
Zhaofeng Li 2024-06-01 08:17:54 -06:00 committed by GitHub
parent 3907b31157 a4f2cae9dd
commit 0558269391
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
server/src/api/binary_cache.rs
View file

@ -9,6 +9,7 @@ use std::io::{Error as IoError, ErrorKind as IoErrorKind};
use std::path::PathBuf;
use std::sync::Arc;
use axum::body::HttpBody as _;
use axum::{
body::StreamBody,
extract::{Extension, Path},
@ -217,7 +218,11 @@ async fn get_nar(
Download::Url(url) => Ok(Redirect::temporary(&url).into_response()),
Download::AsyncRead(stream) => {
let stream = ReaderStream::new(stream);
let body = StreamBody::new(stream);
let body = StreamBody::new(stream).map_err(|e| {
tracing::error!("Stream error: {e}");
e
});
Ok(body.into_response())
}
}
@ -250,7 +255,11 @@ async fn get_nar(
// TODO: Make num_prefetch configurable
// The ideal size depends on the average chunk size
let merged = merge_chunks(chunks, streamer, storage, 2);
let body = StreamBody::new(merged);
let body = StreamBody::new(merged).map_err(|e| {
tracing::error!("Stream error: {e}");
e
});
Ok(body.into_response())
}
}