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

Merge pull request #154 from cole-h/fixup-stream-error-logging

Browse source 
fixup: stream error logging
This commit is contained in:
Zhaofeng Li 2024-07-31 20:41:06 -04:00 committed by GitHub
parent 6139576a3c 903fb4e39e
commit e127acbf9a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,7 @@ use axum::{
Router, Router,
}; };
use futures::stream::BoxStream; use futures::stream::BoxStream;
use http_body_util::BodyExt; use futures::TryStreamExt as _;
use serde::Serialize; use serde::Serialize;
use tokio_util::io::ReaderStream; use tokio_util::io::ReaderStream;
use tracing::instrument; use tracing::instrument;
@ -217,11 +217,11 @@ async fn get_nar(
match storage.download_file_db(remote_file, false).await? { match storage.download_file_db(remote_file, false).await? {
Download::Url(url) => Ok(Redirect::temporary(&url).into_response()), Download::Url(url) => Ok(Redirect::temporary(&url).into_response()),
Download::AsyncRead(stream) => { Download::AsyncRead(stream) => {
let stream = ReaderStream::new(stream); let stream = ReaderStream::new(stream).map_err(|e| {
let body = Body::from_stream(stream).map_err(|e| {
tracing::error!("Stream error: {e}"); tracing::error!("Stream error: {e}");
e e
}).into_inner(); });
let body = Body::from_stream(stream);
Ok(body.into_response()) Ok(body.into_response())
} }
@ -254,11 +254,11 @@ async fn get_nar(
// TODO: Make num_prefetch configurable // TODO: Make num_prefetch configurable
// The ideal size depends on the average chunk size // The ideal size depends on the average chunk size
let merged = merge_chunks(chunks, streamer, storage, 2); let merged = merge_chunks(chunks, streamer, storage, 2).map_err(|e| {
let body = Body::from_stream(merged).map_err(|e| {
tracing::error!("Stream error: {e}"); tracing::error!("Stream error: {e}");
e e
}).into_inner(); });
let body = Body::from_stream(merged);
Ok(body.into_response()) Ok(body.into_response())
} }