LemmyNet
/
pict-rs
mirror of https://git.asonix.dog/asonix/pict-rs
2
0
Fork 0
Code Releases Activity

Add object ID to not found error

This commit is contained in:
asonix 2023-12-11 13:05:29 -06:00
parent 7293628148
commit b452a577a7
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/store.rs
View File

@ -76,6 +76,7 @@ impl From<crate::store::object_store::ObjectError> for StoreError {
e @ crate::store::object_store::ObjectError::Status( e @ crate::store::object_store::ObjectError::Status(
actix_web::http::StatusCode::NOT_FOUND, actix_web::http::StatusCode::NOT_FOUND,
_, _,
_,
) => Self::ObjectNotFound(e), ) => Self::ObjectNotFound(e),
e => Self::ObjectStore(e), e => Self::ObjectStore(e),
} }

30
src/store/object_store.rs
View File

@ -68,8 +68,8 @@ pub(crate) enum ObjectError {
#[error("Task cancelled")] #[error("Task cancelled")]
Canceled, Canceled,
#[error("Invalid status: {0}\n{1}")] #[error("Invalid status {0} for {2:?} - {1}")]
Status(StatusCode, String), Status(StatusCode, String, Option<Arc<str>>),
} }
#[derive(Debug)] #[derive(Debug)]
@ -105,7 +105,7 @@ impl ObjectError {
| Self::Xml(_) | Self::Xml(_)
| Self::Length | Self::Length
| Self::Etag | Self::Etag
| Self::Status(_, _) => ErrorCode::OBJECT_REQUEST_ERROR, | Self::Status(_, _, _) => ErrorCode::OBJECT_REQUEST_ERROR,
Self::IO(_) => ErrorCode::OBJECT_IO_ERROR, Self::IO(_) => ErrorCode::OBJECT_IO_ERROR,
Self::Utf8(_) => ErrorCode::PARSE_OBJECT_ID_ERROR, Self::Utf8(_) => ErrorCode::PARSE_OBJECT_ID_ERROR,
Self::Canceled => ErrorCode::PANIC, Self::Canceled => ErrorCode::PANIC,
@ -187,7 +187,7 @@ where
Ok(buf) Ok(buf)
} }
async fn status_error(response: Response) -> StoreError { async fn status_error(response: Response, object: Option<Arc<str>>) -> StoreError {
let status = response.status(); let status = response.status();
let body = match response.text().await { let body = match response.text().await {
@ -195,7 +195,7 @@ async fn status_error(response: Response) -> StoreError {
Ok(body) => body, Ok(body) => body,
}; };
ObjectError::Status(status, body).into() ObjectError::Status(status, body, object).into()
} }
#[async_trait::async_trait(?Send)] #[async_trait::async_trait(?Send)]
@ -210,7 +210,7 @@ impl Store for ObjectStore {
.map_err(ObjectError::from)?; .map_err(ObjectError::from)?;
if !response.status().is_success() { if !response.status().is_success() {
return Err(status_error(response).await); return Err(status_error(response, None).await);
} }
Ok(()) Ok(())
@ -252,7 +252,7 @@ impl Store for ObjectStore {
.map_err(ObjectError::from)?; .map_err(ObjectError::from)?;
if !response.status().is_success() { if !response.status().is_success() {
return Err(status_error(response).await); return Err(status_error(response, None).await);
} }
return Ok(object_id); return Ok(object_id);
@ -268,7 +268,7 @@ impl Store for ObjectStore {
.map_err(ObjectError::from)?; .map_err(ObjectError::from)?;
if !response.status().is_success() { if !response.status().is_success() {
return Err(status_error(response).await); return Err(status_error(response, None).await);
} }
let body = response.text().await.map_err(ObjectError::Request)?; let body = response.text().await.map_err(ObjectError::Request)?;
@ -316,7 +316,7 @@ impl Store for ObjectStore {
.map_err(ObjectError::from)?; .map_err(ObjectError::from)?;
if !response.status().is_success() { if !response.status().is_success() {
return Err(status_error(response).await); return Err(status_error(response, None).await);
} }
let etag = response let etag = response
@ -357,7 +357,7 @@ impl Store for ObjectStore {
.map_err(ObjectError::from)?; .map_err(ObjectError::from)?;
if !response.status().is_success() { if !response.status().is_success() {
return Err(status_error(response).await); return Err(status_error(response, None).await);
} }
Ok(()) as Result<(), StoreError> Ok(()) as Result<(), StoreError>
@ -392,7 +392,7 @@ impl Store for ObjectStore {
.map_err(ObjectError::from)?; .map_err(ObjectError::from)?;
if !response.status().is_success() { if !response.status().is_success() {
return Err(status_error(response).await); return Err(status_error(response, None).await);
} }
Ok(object_id) Ok(object_id)
@ -420,7 +420,7 @@ impl Store for ObjectStore {
.map_err(ObjectError::from)?; .map_err(ObjectError::from)?;
if !response.status().is_success() { if !response.status().is_success() {
return Err(status_error(response).await); return Err(status_error(response, Some(identifier.clone())).await);
} }
Ok(Box::pin(crate::stream::metrics( Ok(Box::pin(crate::stream::metrics(
@ -448,7 +448,7 @@ impl Store for ObjectStore {
if !response.status().is_success() { if !response.status().is_success() {
return Err(std::io::Error::new( return Err(std::io::Error::new(
std::io::ErrorKind::Other, std::io::ErrorKind::Other,
status_error(response).await, status_error(response, Some(identifier.clone())).await,
)); ));
} }
@ -477,7 +477,7 @@ impl Store for ObjectStore {
.map_err(ObjectError::from)?; .map_err(ObjectError::from)?;
if !response.status().is_success() { if !response.status().is_success() {
return Err(status_error(response).await); return Err(status_error(response, Some(identifier.clone())).await);
} }
let length = response let length = response
@ -502,7 +502,7 @@ impl Store for ObjectStore {
.map_err(ObjectError::from)?; .map_err(ObjectError::from)?;
if !response.status().is_success() { if !response.status().is_success() {
return Err(status_error(response).await); return Err(status_error(response, Some(identifier.clone())).await);
} }
Ok(()) Ok(())