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

use CustomRequest name for enum variant; log is already implied

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

10
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::CustomRequestLog(inner_label, _) => label == inner_label, FormatText::CustomRequest(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::CustomRequestLog(_, inner_closure) => { FormatText::CustomRequest(_, 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::CustomRequestLog(key.as_str().to_owned(), None), "xi" => FormatText::CustomRequest(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),
CustomRequestLog(String, Option<CustomRequestFn>), CustomRequest(String, Option<CustomRequestFn>),
} }
#[derive(Clone)] #[derive(Clone)]
@ -549,7 +549,7 @@ impl FormatText {
}; };
*self = s; *self = s;
} }
FormatText::CustomLog(_, closure) => { FormatText::CustomRequest(_, closure) => {
let s = if let Some(closure) = closure { let s = if let Some(closure) = closure {
FormatText::Str((closure.inner_fn)(req)) FormatText::Str((closure.inner_fn)(req))
} else { } else {