mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-06-20 14:10:45 +00:00
Code Issues Projects 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actix-http/CHANGES.md
View file

@ -6,6 +6,8 @@
* Export IntoHeaderValue
* Render error and return as response body
### Deleted
* Removed PayloadBuffer

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

4
actix-http/tests/test_server.rs
View file

@ -867,7 +867,7 @@ fn test_h1_response_http_error_handling() {
// read response
let bytes = srv.load_body(response).unwrap();
assert!(bytes.is_empty());
assert_eq!(bytes, Bytes::from_static(b"failed to parse header value"));
}
#[cfg(feature = "ssl")]
@ -900,7 +900,7 @@ fn test_h2_response_http_error_handling() {
// read response
let bytes = srv.load_body(response).unwrap();
assert!(bytes.is_empty());
assert_eq!(bytes, Bytes::from_static(b"failed to parse header value"));
}
#[test]

11
src/middleware/logger.rs
View file

@ -417,12 +417,7 @@ impl FormatText {
))
};
}
FormatText::UrlPath => {
*self = FormatText::Str(format!(
"{}",
req.path()
))
}
FormatText::UrlPath => *self = FormatText::Str(format!("{}", req.path())),
FormatText::RequestTime => {
*self = FormatText::Str(format!(
"{:?}",
@ -489,7 +484,9 @@ mod tests {
let req = TestRequest::with_header(
header::USER_AGENT,
header::HeaderValue::from_static("ACTIX-WEB"),
).uri("/test/route/yeah").to_srv_request();
)
.uri("/test/route/yeah")
.to_srv_request();
let now = time::now();
for unit in &mut format.0 {