tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-09-08 00:00:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

trace: fix debug and debug_span macro regression from #1103 (#1170)

Browse Source 
PR #1103 accidentally changed the log level for the debug and
debug_span macros to use the INFO level instead of the DEBUG
level. This PR corrects this regression back to the intended
behavior.
This commit is contained in:
Matt Bilker
2019-06-22 16:31:25 -07:00
committed by Eliza Weisman
parent 36ed35c52c
commit df2c3cd475
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tokio-trace/src/macros.rs
+18 -18
View File
@@ -378,7 +378,7 @@ macro_rules! trace_span {
macro_rules! debug_span { macro_rules! debug_span {
(target: $target:expr, parent: $parent:expr, $name:expr, $($field:tt)*) => { (target: $target:expr, parent: $parent:expr, $name:expr, $($field:tt)*) => {
span!( span!(
$crate::Level::INFO, $crate::Level::DEBUG,
target: $target, target: $target,
parent: $parent, parent: $parent,
$name, $name,
@@ -390,7 +390,7 @@ macro_rules! debug_span {
}; };
(parent: $parent:expr, $name:expr, $($field:tt)*) => { (parent: $parent:expr, $name:expr, $($field:tt)*) => {
span!( span!(
$crate::Level::INFO, $crate::Level::DEBUG,
target: __tokio_trace_module_path!(), target: __tokio_trace_module_path!(),
parent: $parent, parent: $parent,
$name, $name,
@@ -402,7 +402,7 @@ macro_rules! debug_span {
}; };
(target: $target:expr, $name:expr, $($field:tt)*) => { (target: $target:expr, $name:expr, $($field:tt)*) => {
span!( span!(
$crate::Level::INFO, $crate::Level::DEBUG,
target: $target, target: $target,
$name, $name,
$($field)* $($field)*
@@ -413,7 +413,7 @@ macro_rules! debug_span {
}; };
($name:expr, $($field:tt)*) => { ($name:expr, $($field:tt)*) => {
span!( span!(
$crate::Level::INFO, $crate::Level::DEBUG,
target: __tokio_trace_module_path!(), target: __tokio_trace_module_path!(),
$name, $name,
$($field)* $($field)*
@@ -939,24 +939,24 @@ macro_rules! trace {
#[macro_export(local_inner_macros)] #[macro_export(local_inner_macros)]
macro_rules! debug { macro_rules! debug {
(target: $target:expr, { $($field:tt)* }, $($arg:tt)* ) => ( (target: $target:expr, { $($field:tt)* }, $($arg:tt)* ) => (
event!(target: $target, $crate::Level::INFO, { $($field)* }, $($arg)*) event!(target: $target, $crate::Level::DEBUG, { $($field)* }, $($arg)*)
); );
(target: $target:expr, $($k:ident).+ $($field:tt)+ ) => ( (target: $target:expr, $($k:ident).+ $($field:tt)+ ) => (
event!(target: $target, $crate::Level::INFO, { $($k).+ $($field)+ }) event!(target: $target, $crate::Level::DEBUG, { $($k).+ $($field)+ })
); );
(target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => ( (target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
event!(target: $target, $crate::Level::INFO, { $($k).+ $($field)+ }) event!(target: $target, $crate::Level::DEBUG, { $($k).+ $($field)+ })
); );
(target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => ( (target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
event!(target: $target, $crate::Level::INFO, { $($k).+ $($field)+ }) event!(target: $target, $crate::Level::DEBUG, { $($k).+ $($field)+ })
); );
(target: $target:expr, $($arg:tt)+ ) => ( (target: $target:expr, $($arg:tt)+ ) => (
event!(target: $target, $crate::Level::INFO, {}, $($arg)+) event!(target: $target, $crate::Level::DEBUG, {}, $($arg)+)
); );
({ $($field:tt)+ }, $($arg:tt)+ ) => ( ({ $($field:tt)+ }, $($arg:tt)+ ) => (
event!( event!(
target: __tokio_trace_module_path!(), target: __tokio_trace_module_path!(),
$crate::Level::INFO, $crate::Level::DEBUG,
{ $($field)+ }, { $($field)+ },
$($arg)+ $($arg)+
) )
@@ -964,49 +964,49 @@ macro_rules! debug {
($($k:ident).+ = $($field:tt)*) => ( ($($k:ident).+ = $($field:tt)*) => (
event!( event!(
target: __tokio_trace_module_path!(), target: __tokio_trace_module_path!(),
$crate::Level::INFO, $crate::Level::DEBUG,
{ $($k).+ = $($field)*} { $($k).+ = $($field)*}
) )
); );
(?$($k:ident).+ = $($field:tt)*) => ( (?$($k:ident).+ = $($field:tt)*) => (
event!( event!(
target: __tokio_trace_module_path!(), target: __tokio_trace_module_path!(),
$crate::Level::INFO, $crate::Level::DEBUG,
{ ?$($k).+ = $($field)*} { ?$($k).+ = $($field)*}
) )
); );
(%$($k:ident).+ = $($field:tt)*) => ( (%$($k:ident).+ = $($field:tt)*) => (
event!( event!(
target: __tokio_trace_module_path!(), target: __tokio_trace_module_path!(),
$crate::Level::INFO, $crate::Level::DEBUG,
{ %$($k).+ = $($field)*} { %$($k).+ = $($field)*}
) )
); );
($($k:ident).+, $($field:tt)*) => ( ($($k:ident).+, $($field:tt)*) => (
event!( event!(
target: __tokio_trace_module_path!(), target: __tokio_trace_module_path!(),
$crate::Level::INFO, $crate::Level::DEBUG,
{ $($k).+, $($field)*} { $($k).+, $($field)*}
) )
); );
(?$($k:ident).+, $($field:tt)*) => ( (?$($k:ident).+, $($field:tt)*) => (
event!( event!(
target: __tokio_trace_module_path!(), target: __tokio_trace_module_path!(),
$crate::Level::INFO, $crate::Level::DEBUG,
{ ?$($k).+, $($field)*} { ?$($k).+, $($field)*}
) )
); );
(%$($k:ident).+, $($field:tt)*) => ( (%$($k:ident).+, $($field:tt)*) => (
event!( event!(
target: __tokio_trace_module_path!(), target: __tokio_trace_module_path!(),
$crate::Level::INFO, $crate::Level::DEBUG,
{ %$($k).+, $($field)*} { %$($k).+, $($field)*}
) )
); );
($($arg:tt)+) => ( ($($arg:tt)+) => (
event!( event!(
target: __tokio_trace_module_path!(), target: __tokio_trace_module_path!(),
$crate::Level::INFO, $crate::Level::DEBUG,
{}, {},
$($arg)+ $($arg)+
) )
@@ -1658,7 +1658,7 @@ macro_rules! level_to_log {
$crate::Level::ERROR => $crate::log::Level::Error, $crate::Level::ERROR => $crate::log::Level::Error,
$crate::Level::WARN => $crate::log::Level::Warn, $crate::Level::WARN => $crate::log::Level::Warn,
$crate::Level::INFO => $crate::log::Level::Info, $crate::Level::INFO => $crate::log::Level::Info,
$crate::Level::INFO => $crate::log::Level::Debug, $crate::Level::DEBUG => $crate::log::Level::Debug,
_ => $crate::log::Level::Trace, _ => $crate::log::Level::Trace,
} }
}; };