magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

log erroring errors; improve inspection functors.

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-09 03:36:08 +00:00
parent 4718387dbe
commit 158de10fe6
3 changed files with 40 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/core/error.rs
View file

@ -116,21 +116,46 @@ impl Error {
}
}
impl From<Infallible> for Error {
fn from(i: Infallible) -> Self { match i {} }
#[inline]
pub fn log(e: &Error) {
error!(?e);
}
#[inline]
pub fn debug_log(e: &Error) {
debug_error!(?e);
}
#[inline]
pub fn into_log(e: Error) {
error!(?e);
drop(e);
}
#[inline]
pub fn into_debug_log(e: Error) {
debug_error!(?e);
drop(e);
}
impl fmt::Debug for Error {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{self}") }
}
impl From<Infallible> for Error {
fn from(i: Infallible) -> Self { match i {} }
}
impl axum::response::IntoResponse for Error {
fn into_response(self) -> axum::response::Response {
let response: UiaaResponse = self.into();
response.try_into_http_response::<BytesMut>().map_or_else(
|_| StatusCode::INTERNAL_SERVER_ERROR.into_response(),
|r| r.map(BytesMut::freeze).map(Full::new).into_response(),
)
response
.try_into_http_response::<BytesMut>()
.inspect_err(|e| error!(?e))
.map_or_else(
|_| StatusCode::INTERNAL_SERVER_ERROR.into_response(),
|r| r.map(BytesMut::freeze).map(Full::new).into_response(),
)
}
}
@ -220,15 +245,3 @@ fn ruma_error_kind(e: &ruma::api::client::error::Error) -> &ruma::api::client::e
e.error_kind()
.unwrap_or(&ruma::api::client::error::ErrorKind::Unknown)
}
#[inline]
pub fn log(e: Error) {
error!("{e}");
drop(e);
}
#[inline]
pub fn debug_log(e: Error) {
debug_error!("{e}");
drop(e);
}