diff --git a/log/src/log.rs b/log/src/log.rs index e08dc55..bf04f14 100644 --- a/log/src/log.rs +++ b/log/src/log.rs @@ -2,12 +2,13 @@ // pub use tracing::debug; // pub use tracing::error; // pub use tracing::info; -pub use tracing::trace; +// pub use tracing::trace; pub use tracing::warn; pub use direct_debug as debug; pub use direct_error as error; pub use direct_info as info; +pub use direct_trace as trace; pub mod log_macros_direct { #[allow(unused)] diff --git a/netfetch/src/ca/conn.rs b/netfetch/src/ca/conn.rs index b511440..15884c8 100644 --- a/netfetch/src/ca/conn.rs +++ b/netfetch/src/ca/conn.rs @@ -1489,7 +1489,7 @@ impl CaConn { } fn handle_writer_establish_inner(&mut self, cid: Cid, writer: CaRtWriter) -> Result<(), Error> { - trace!("handle_writer_establish_inner {cid:?}"); + trace!("handle_writer_establish_inner {:?}", cid); let dbg_chn_cid = dbg_chn_cid(cid, self); if dbg_chn_cid { info!("handle_writer_establish_inner {:?}", cid); @@ -2693,7 +2693,7 @@ impl CaConn { self.mett.caget_timeout().inc(); let next = PollTickStateIdle::decide_next(st4.next_backup, st3.poll_ivl, tsnow); if self.trace_channel_poll { - trace!("make poll idle after poll timeout {next:?}"); + trace!("make poll idle after poll timeout {:?}", next); } st3.tick = PollTickState::Idle(PollTickStateIdle { next }); } @@ -2705,7 +2705,7 @@ impl CaConn { ChannelState::Closing(st2) => { if st2.tsbeg + TIMEOUT_CHANNEL_CLOSING < tsnow { let name = conf.conf.name(); - warn!("timeout while closing channel {name}"); + warn!("timeout while closing channel {}", name); do_shutdown = Some(ShutdownReason::IocTimeout); } } @@ -2847,7 +2847,7 @@ impl CaConn { CaMsgTy::SearchRes(k) => { let a = k.addr.to_be_bytes(); let addr = format!("{}.{}.{}.{}:{}", a[0], a[1], a[2], a[3], k.tcp_port); - trace!("search result indicates server address: {addr}"); + trace!("search result indicates server address: {}", addr); // TODO count this unexpected case. } CaMsgTy::CreateChanRes(k) => { @@ -2911,11 +2911,11 @@ impl CaConn { } } CaMsgTy::Error(msg) => { - warn!("CaConn sees: {msg:?}"); + warn!("CaConn sees: {:?}", msg); } CaMsgTy::AccessRightsRes(msg) => { if false { - warn!("CaConn sees: {msg:?}"); + warn!("CaConn sees: {:?}", msg); } } CaMsgTy::VersionRes(_) => { diff --git a/netfetch/src/ca/connset.rs b/netfetch/src/ca/connset.rs index 6c3bb7f..e1990c7 100644 --- a/netfetch/src/ca/connset.rs +++ b/netfetch/src/ca/connset.rs @@ -702,7 +702,7 @@ impl CaConnSet { } fn handle_series_lookup_result(&mut self, res: Result) -> Result<(), Error> { - trace!("handle_series_lookup_result {res:?}"); + trace!("handle_series_lookup_result {:?}", res); if self.shutdown_stopping { Ok(()) } else { @@ -920,7 +920,7 @@ impl CaConnSet { } fn handle_ioc_query_result(&mut self, results: VecDeque) -> Result<(), Error> { - trace!("handle_ioc_query_result {results:?}"); + trace!("handle_ioc_query_result {:?}", results); if self.shutdown_stopping { return Ok(()); } diff --git a/netfetch/src/ca/finder.rs b/netfetch/src/ca/finder.rs index 8812ba2..bbd1483 100644 --- a/netfetch/src/ca/finder.rs +++ b/netfetch/src/ca/finder.rs @@ -119,7 +119,7 @@ async fn finder_worker( trace!("finder_worker jh_batch awaited"); for (i, jh) in jhs.into_iter().enumerate() { jh.await??; - trace!("finder_worker single {i} awaited"); + trace!("finder_worker single {} awaited", i); } Ok(()) } @@ -259,11 +259,11 @@ async fn finder_network_if_not_found( } } drop(net_tx); - trace!("{self_name} loop end"); + trace!("{} loop end", self_name); jh_ca_search.await??; - trace!("{self_name} jh_ca_search awaited"); + trace!("{} jh_ca_search awaited", self_name); jh2.await??; - trace!("{self_name} process_net_result awaited"); + trace!("{} process_net_result awaited", self_name); Ok(()) } diff --git a/netfetch/src/ca/search.rs b/netfetch/src/ca/search.rs index 53ac540..3d79541 100644 --- a/netfetch/src/ca/search.rs +++ b/netfetch/src/ca/search.rs @@ -25,11 +25,11 @@ async fn resolve_address(addr_str: &str) -> Result { let ac = match addr_str.parse::() { Ok(k) => k, Err(_) => { - trace!("can not parse {addr_str} as SocketAddr"); + trace!("can not parse {} as SocketAddr", addr_str); match addr_str.parse::() { Ok(k) => SocketAddr::new(k, PORT_DEFAULT), Err(_e) => { - trace!("can not parse {addr_str} as IpAddr"); + trace!("can not parse {} as IpAddr", addr_str); let (hostname, port) = if addr_str.contains(":") { let mut it = addr_str.split(":"); ( @@ -79,7 +79,7 @@ async fn search_tgts_from_opts(opts: &CaIngestOpts) -> Result<(Vec for s in opts.search() { match resolve_address(s).await { Ok(addr) => { - trace!("resolved {s} as {addr}"); + trace!("resolved {} as {}", s, addr); match addr { SocketAddr::V4(addr) => { addrs.push(addr); @@ -99,7 +99,7 @@ async fn search_tgts_from_opts(opts: &CaIngestOpts) -> Result<(Vec for s in opts.search_blacklist() { match resolve_address(s).await { Ok(addr) => { - trace!("resolved {s} as {addr}"); + trace!("resolved {} as {}", s, addr); match addr { SocketAddr::V4(addr) => { addrs.push(addr);