zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

fix: dont print twice the server response body

Browse source
This commit is contained in:
əlemi 2024-05-11 22:47:59 +02:00
parent fc572f1c69
commit 0a0facae79
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/errors.rs
View file

@ -1,4 +1,4 @@
use axum::{http::StatusCode, response::{IntoResponse, Redirect}}; use axum::{http::StatusCode, response::Redirect};
#[derive(Debug, thiserror::Error)] #[derive(Debug, thiserror::Error)]
pub enum UpubError { pub enum UpubError {
@ -79,12 +79,7 @@ impl axum::response::IntoResponse for UpubError {
UpubError::Redirect(to) => Redirect::to(&to).into_response(), UpubError::Redirect(to) => Redirect::to(&to).into_response(),
UpubError::Status(status) => (status, descr).into_response(), UpubError::Status(status) => (status, descr).into_response(),
UpubError::Database(_) => (StatusCode::SERVICE_UNAVAILABLE, descr).into_response(), UpubError::Database(_) => (StatusCode::SERVICE_UNAVAILABLE, descr).into_response(),
UpubError::FetchError(e, body) => UpubError::Reqwest(x) | UpubError::FetchError(x, _) =>
(
e.status().unwrap_or(StatusCode::INTERNAL_SERVER_ERROR),
format!("failed fetching '{}': {descr} -- server responded with {body}", e.url().map(|x| x.to_string()).unwrap_or_default()),
).into_response(),
UpubError::Reqwest(x) =>
( (
x.status().unwrap_or(StatusCode::INTERNAL_SERVER_ERROR), x.status().unwrap_or(StatusCode::INTERNAL_SERVER_ERROR),
format!("failed fetching '{}': {descr}", x.url().map(|x| x.to_string()).unwrap_or_default()) format!("failed fetching '{}': {descr}", x.url().map(|x| x.to_string()).unwrap_or_default())