actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-24 22:37:35 +02:00
Code Issues Releases Wiki Activity

Render error and return as response body

Browse Source
This commit is contained in:
Nikolay Kim
2019-04-03 19:55:19 -07:00
parent 954fe21751
commit 1e2bd68e83
5 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
actix-http/src/error.rs
View File

@ -18,8 +18,6 @@ use tokio_timer::Error as TimerError;
// re-export for convinience
pub use crate::cookie::ParseError as CookieParseError;
use crate::body::Body;
use crate::response::Response;
/// A specialized [`Result`](https://doc.rust-lang.org/std/result/enum.Result.html)
@ -49,13 +47,6 @@ impl Error {
pub fn as_response_error(&self) -> &ResponseError {
self.cause.as_ref()
}
/// Converts error to a response instance and set error message as response body
pub fn response_with_message(self) -> Response {
let message = format!("{}", self);
let resp: Response = self.into();
resp.set_body(Body::from(message))
}
}
/// Error that can be converted to `Response`

23
actix-http/src/response.rs
View File

@ -1,7 +1,7 @@
//! Http response
use std::cell::{Ref, RefMut};
use std::io::Write;
use std::{fmt, str};
use std::{fmt, io, str};
use bytes::{BufMut, Bytes, BytesMut};
use futures::future::{ok, FutureResult, IntoFuture};
@ -54,10 +54,13 @@ impl Response<Body> {
/// Constructs an error response
#[inline]
pub fn from_error(error: Error) -> Response {
let resp = error.as_response_error().error_response();
let mut resp = resp.set_body(Body::from(format!("{}", error)));
let mut resp = error.as_response_error().error_response();
let mut buf = BytesMut::new();
let _ = write!(Writer(&mut buf), "{}", error);
resp.headers_mut()
.insert(header::CONTENT_TYPE, HeaderValue::from_static("text/plain"));
resp.error = Some(error);
resp
resp.set_body(Body::from(buf))
}
/// Convert response to response with body
@ -300,6 +303,18 @@ impl<'a> Iterator for CookieIter<'a> {
}
}
pub struct Writer<'a>(pub &'a mut BytesMut);
impl<'a> io::Write for Writer<'a> {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
self.0.extend_from_slice(buf);
Ok(buf.len())
}
fn flush(&mut self) -> io::Result<()> {
Ok(())
}
}
/// An HTTP response builder
///
/// This type can be used to construct an instance of `Response` through a