mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2025-02-16 19:15:13 +00:00
Code Issues Projects Releases Wiki Activity

use tracing in actix-router

Browse source
This commit is contained in:
Rob Ede 2022-03-10 03:14:14 +00:00
parent 80d222aa78
commit fe5279c77a
No known key found for this signature in database
GPG key ID: 97C636207D3EF933
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actix-router/Cargo.toml
View file

@ -23,9 +23,9 @@ default = ["http"]
bytestring = ">=0.1.5, <2" bytestring = ">=0.1.5, <2"
firestorm = "0.5" firestorm = "0.5"
http = { version = "0.2.3", optional = true } http = { version = "0.2.3", optional = true }
log = "0.4"
regex = "1.5" regex = "1.5"
serde = "1" serde = "1"
tracing = { version = "0.1.30", default-features = false, features = ["log"] }
[dev-dependencies] [dev-dependencies]
criterion = { version = "0.3", features = ["html_reports"] } criterion = { version = "0.3", features = ["html_reports"] }

12
actix-router/src/resource.rs
View file

@ -7,6 +7,7 @@ use std::{
use firestorm::{profile_fn, profile_method, profile_section}; use firestorm::{profile_fn, profile_method, profile_section};
use regex::{escape, Regex, RegexSet}; use regex::{escape, Regex, RegexSet};
use tracing::error;
use crate::{path::PathItem, IntoPatterns, Patterns, Resource, ResourcePath}; use crate::{path::PathItem, IntoPatterns, Patterns, Resource, ResourcePath};
@ -714,10 +715,7 @@ impl ResourceDef {
if let Some(m) = captures.name(name) { if let Some(m) = captures.name(name) {
segments[no] = PathItem::Segment(m.start() as u16, m.end() as u16); segments[no] = PathItem::Segment(m.start() as u16, m.end() as u16);
} else { } else {
log::error!( error!("Dynamic path match but not all segments found: {}", name);
"Dynamic path match but not all segments found: {}",
name
);
return false; return false;
} }
} }
@ -744,7 +742,7 @@ impl ResourceDef {
if let Some(m) = captures.name(name) { if let Some(m) = captures.name(name) {
segments[no] = PathItem::Segment(m.start() as u16, m.end() as u16); segments[no] = PathItem::Segment(m.start() as u16, m.end() as u16);
} else { } else {
log::error!("Dynamic path match but not all segments found: {}", name); error!("Dynamic path match but not all segments found: {}", name);
return false; return false;
} }
} }
@ -1038,7 +1036,7 @@ impl ResourceDef {
// tail segments in prefixes have no defined semantics // tail segments in prefixes have no defined semantics
#[cfg(not(test))] #[cfg(not(test))]
log::warn!( tracing::warn!(
"Prefix resources should not have tail segments. \ "Prefix resources should not have tail segments. \
Use `ResourceDef::new` constructor. \ Use `ResourceDef::new` constructor. \
This may become a panic in the future." This may become a panic in the future."
@ -1053,7 +1051,7 @@ impl ResourceDef {
// unnamed tail segment // unnamed tail segment
#[cfg(not(test))] #[cfg(not(test))]
log::warn!( tracing::warn!(
"Tail segments must have names. \ "Tail segments must have names. \
Consider `.../{{tail}}*`. \ Consider `.../{{tail}}*`. \
This may become a panic in the future." This may become a panic in the future."