Kieran/nginx-log-parser
1
0
Fork 0
mirror of https://github.com/themasch/nginx-log-parser.git synced 2025-02-13 20:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(format_parser): do not include the '$' in the variable name.

Browse Source 
if we don't include it, we don't need to trim it away.
This commit is contained in:
Mark Schmale 2018-09-13 10:49:47 +02:00
parent fc804cb874
commit 9bfac330f8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/format.rs
View File

@ -121,10 +121,10 @@ impl FormatPart {
match self { match self {
Variable(name) => format!( Variable(name) => format!(
"(?P<{}>{})", "(?P<{}>{})",
name.trim_left_matches('$'), name,
match name.as_str() { match name.as_str() {
"$status" => "\\d{3}", "status" => "\\d{3}",
"$body_bytes_sent" => "\\d+", "body_bytes_sent" => "\\d+",
_ => ".*", _ => ".*",
} }
), ),
@ -150,7 +150,7 @@ fn read_byte(chr: u8, index: usize, state: &FormatParserState) -> FormatParserSt
use format::FormatParserState::*; use format::FormatParserState::*;
match state { match state {
Start => match chr { Start => match chr {
b'$' => Variable(index, index + 1), b'$' => Variable(index + 1, index + 1),
_ => Fixed(index, index + 1), _ => Fixed(index, index + 1),
}, },
Variable(start, _end) => match chr { Variable(start, _end) => match chr {
@ -159,7 +159,7 @@ fn read_byte(chr: u8, index: usize, state: &FormatParserState) -> FormatParserSt
_ => Fixed(index, index + 1), _ => Fixed(index, index + 1),
}, },
Fixed(start, _end) => match chr { Fixed(start, _end) => match chr {
b'$' => Variable(index, index + 1), b'$' => Variable(index + 1, index + 1),
_ => Fixed(*start, index + 1), _ => Fixed(*start, index + 1),
}, },
} }
@ -217,23 +217,23 @@ mod test {
let format = Format::from_str(format_input).unwrap(); let format = Format::from_str(format_input).unwrap();
assert_eq!( assert_eq!(
Some(&Variable(String::from("$remote_addr"))), Some(&Variable(String::from("remote_addr"))),
format.parts.get(0) format.parts.get(0)
); );
assert_eq!(Some(&Fixed(String::from(" - "))), format.parts.get(1)); assert_eq!(Some(&Fixed(String::from(" - "))), format.parts.get(1));
assert_eq!( assert_eq!(
Some(&Variable(String::from("$remote_user"))), Some(&Variable(String::from("remote_user"))),
format.parts.get(2) format.parts.get(2)
); );
assert_eq!(Some(&Fixed(String::from(" ["))), format.parts.get(3)); assert_eq!(Some(&Fixed(String::from(" ["))), format.parts.get(3));
assert_eq!( assert_eq!(
Some(&Variable(String::from("$time_local"))), Some(&Variable(String::from("time_local"))),
format.parts.get(4) format.parts.get(4)
); );
assert_eq!(Some(&Fixed(String::from(r#"] ""#))), format.parts.get(5)); assert_eq!(Some(&Fixed(String::from(r#"] ""#))), format.parts.get(5));
assert_eq!(Some(&Fixed(String::from(r#"] ""#))), format.parts.get(5)); assert_eq!(Some(&Fixed(String::from(r#"] ""#))), format.parts.get(5));
assert_eq!( assert_eq!(
Some(&Variable(String::from("$request"))), Some(&Variable(String::from("request"))),
format.parts.get(6) format.parts.get(6)
); );
assert_eq!(Some(&Fixed(String::from(r#"" ""#))), format.parts.get(15)); assert_eq!(Some(&Fixed(String::from(r#"" ""#))), format.parts.get(15));