From fe5279c77ae8c39792e5865a1478343ebf39b7ec Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Thu, 10 Mar 2022 03:14:14 +0000
Subject: [PATCH] use tracing in actix-router

---
 actix-router/Cargo.toml      |  2 +-
 actix-router/src/resource.rs | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/actix-router/Cargo.toml b/actix-router/Cargo.toml
index 50210911..6fcef125 100644
--- a/actix-router/Cargo.toml
+++ b/actix-router/Cargo.toml
@@ -23,9 +23,9 @@ default = ["http"]
 bytestring = ">=0.1.5, <2"
 firestorm = "0.5"
 http = { version = "0.2.3", optional = true }
-log = "0.4"
 regex = "1.5"
 serde = "1"
+tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
 [dev-dependencies]
 criterion = { version = "0.3", features = ["html_reports"] }
diff --git a/actix-router/src/resource.rs b/actix-router/src/resource.rs
index c616b467..3d121f36 100644
--- a/actix-router/src/resource.rs
+++ b/actix-router/src/resource.rs
@@ -7,6 +7,7 @@ use std::{
 
 use firestorm::{profile_fn, profile_method, profile_section};
 use regex::{escape, Regex, RegexSet};
+use tracing::error;
 
 use crate::{path::PathItem, IntoPatterns, Patterns, Resource, ResourcePath};
 
@@ -714,10 +715,7 @@ impl ResourceDef {
                         if let Some(m) = captures.name(name) {
                             segments[no] = PathItem::Segment(m.start() as u16, m.end() as u16);
                         } else {
-                            log::error!(
-                                "Dynamic path match but not all segments found: {}",
-                                name
-                            );
+                            error!("Dynamic path match but not all segments found: {}", name);
                             return false;
                         }
                     }
@@ -744,7 +742,7 @@ impl ResourceDef {
                     if let Some(m) = captures.name(name) {
                         segments[no] = PathItem::Segment(m.start() as u16, m.end() as u16);
                     } else {
-                        log::error!("Dynamic path match but not all segments found: {}", name);
+                        error!("Dynamic path match but not all segments found: {}", name);
                         return false;
                     }
                 }
@@ -1038,7 +1036,7 @@ impl ResourceDef {
             // tail segments in prefixes have no defined semantics
 
             #[cfg(not(test))]
-            log::warn!(
+            tracing::warn!(
                 "Prefix resources should not have tail segments. \
                 Use `ResourceDef::new` constructor. \
                 This may become a panic in the future."
@@ -1053,7 +1051,7 @@ impl ResourceDef {
             // unnamed tail segment
 
             #[cfg(not(test))]
-            log::warn!(
+            tracing::warn!(
                 "Tail segments must have names. \
                 Consider `.../{{tail}}*`. \
                 This may become a panic in the future."