diff --git a/crates/daqbuffer/Cargo.toml b/crates/daqbuffer/Cargo.toml index 98ab63d..71c61e1 100644 --- a/crates/daqbuffer/Cargo.toml +++ b/crates/daqbuffer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "daqbuffer" -version = "0.5.5-aa.7" +version = "0.5.5-aa.8" authors = ["Dominik Werder "] edition = "2021" diff --git a/crates/httpret/src/httpret.rs b/crates/httpret/src/httpret.rs index 11d258e..dccc5f5 100644 --- a/crates/httpret/src/httpret.rs +++ b/crates/httpret/src/httpret.rs @@ -258,14 +258,16 @@ where match h { Ok(k) => k, Err(e) => { - error!("Cont catch_unwind {e:?}"); - match e.downcast_ref::() { - Some(e) => { - error!("Cont catch_unwind is Error: {e:?}"); - } - None => {} + if let Some(v) = e.downcast_ref::() { + error!("Cont catch_unwind is Error: {}", v); + } else if let Some(v) = e.downcast_ref::() { + error!("Cont catch_unwind is String: {}", v); + } else if let Some(v) = e.downcast_ref::<&str>() { + error!("Cont catch_unwind is &str: {}", v); + } else { + error!("Cont catch_unwind {:?}", e); } - Poll::Ready(Err(Error::with_msg_no_trace(format!("{e:?}")))) + Poll::Ready(Err(Error::with_msg_no_trace(format!("{:?}", e)))) } } } diff --git a/crates/taskrun/src/taskrun.rs b/crates/taskrun/src/taskrun.rs index 993f838..e952e8e 100644 --- a/crates/taskrun/src/taskrun.rs +++ b/crates/taskrun/src/taskrun.rs @@ -215,8 +215,8 @@ fn tracing_init_inner(mode: TracingMode) -> Result<(), Error> { sr = g.parent(); } } + allow = true; allow - // true } else { false } @@ -251,8 +251,8 @@ fn tracing_init_inner(mode: TracingMode) -> Result<(), Error> { sr = g.parent(); } } + allow = true; allow - // true } else { false }