berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

add request name in custom log enum variant

This commit is contained in:
jdeepee 2020-10-28 10:55:27 +00:00
parent c46b2609d9
commit 0577211acb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/middleware/logger.rs
View File

@ -134,12 +134,12 @@ impl Logger {
let inner = Rc::get_mut(&mut self.0).unwrap(); let inner = Rc::get_mut(&mut self.0).unwrap();
let pos = inner.format.0.iter().position(|tf| match tf { let pos = inner.format.0.iter().position(|tf| match tf {
FormatText::CustomLog(inner_label, _) => label == inner_label, FormatText::CustomRequestLog(inner_label, _) => label == inner_label,
_ => false, _ => false,
}); });
match pos { match pos {
Some(pos) => match &mut inner.format.0[pos] { Some(pos) => match &mut inner.format.0[pos] {
FormatText::CustomLog(_, inner_closure) => { FormatText::CustomRequestLog(_, inner_closure) => {
*inner_closure = Some(CustomRequestFn { *inner_closure = Some(CustomRequestFn {
inner_fn: Rc::new(closure), inner_fn: Rc::new(closure),
}) })
@ -383,7 +383,7 @@ impl Format {
HeaderName::try_from(key.as_str()).unwrap(), HeaderName::try_from(key.as_str()).unwrap(),
), ),
"e" => FormatText::EnvironHeader(key.as_str().to_owned()), "e" => FormatText::EnvironHeader(key.as_str().to_owned()),
"xi" => FormatText::CustomLog(key.as_str().to_owned(), None), "xi" => FormatText::CustomRequestLog(key.as_str().to_owned(), None),
_ => unreachable!(), _ => unreachable!(),
}) })
} else { } else {
@ -429,7 +429,7 @@ pub enum FormatText {
RequestHeader(HeaderName), RequestHeader(HeaderName),
ResponseHeader(HeaderName), ResponseHeader(HeaderName),
EnvironHeader(String), EnvironHeader(String),
CustomLog(String, Option<CustomRequestFn>), CustomRequestLog(String, Option<CustomRequestFn>),
} }
#[derive(Clone)] #[derive(Clone)]