Merge pull request #1388 from eclipse-zenoh/dev/logs

Improve error handling and logs in examples

commons/zenoh-codec/tests/codec.rs

@@ -388,7 +388,7 @@ fn codec_shm_info() {
 // Common
 #[test]
 fn codec_extension() {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
 
     macro_rules! run_extension_single {
         ($ext:ty, $buff:expr) => {

examples/examples/z_alloc_shm.rs

@@ -23,7 +23,7 @@ use zenoh::{
 #[tokio::main]
 async fn main() {
     // Initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
     run().await.unwrap()
 }
 

examples/examples/z_delete.rs

@@ -18,7 +18,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, key_expr) = parse_args();
 

examples/examples/z_forward.rs

@@ -19,7 +19,7 @@ use zenoh_ext::SubscriberForward;
 #[tokio::main]
 async fn main() {
     // Initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, key_expr, forward) = parse_args();
 

examples/examples/z_get.rs

@@ -23,7 +23,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, selector, payload, target, timeout) = parse_args();
 

examples/examples/z_get_liveliness.rs

@@ -20,7 +20,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, key_expr, timeout) = parse_args();
 

examples/examples/z_get_shm.rs

@@ -29,7 +29,7 @@ const N: usize = 10;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, selector, mut payload, target, timeout) = parse_args();
 

examples/examples/z_info.rs

@@ -18,7 +18,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let config = parse_args();
 

examples/examples/z_liveliness.rs

@@ -18,7 +18,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // Initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, key_expr) = parse_args();
 

examples/examples/z_ping.rs

@@ -19,7 +19,7 @@ use zenoh_examples::CommonArgs;
 
 fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, warmup, size, n, express) = parse_args();
     let session = zenoh::open(config).wait().unwrap();

examples/examples/z_ping_shm.rs

@@ -26,7 +26,7 @@ use zenoh_examples::CommonArgs;
 
 fn main() {
     // Initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, warmup, size, n) = parse_args();
 

examples/examples/z_pong.rs

@@ -17,7 +17,7 @@ use zenoh_examples::CommonArgs;
 
 fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, express) = parse_args();
 

examples/examples/z_pub.rs

@@ -20,7 +20,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // Initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, key_expr, payload, attachment) = parse_args();
 

examples/examples/z_pub_shm.rs

@@ -27,7 +27,7 @@ const N: usize = 10;
 #[tokio::main]
 async fn main() -> Result<(), ZError> {
     // Initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, path, payload) = parse_args();
 

examples/examples/z_pub_shm_thr.rs

@@ -24,7 +24,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
     let (config, sm_size, size) = parse_args();
 
     let z = zenoh::open(config).await.unwrap();

examples/examples/z_pub_thr.rs

@@ -24,7 +24,7 @@ use zenoh_examples::CommonArgs;
 
 fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
     let args = Args::parse();
 
     let mut prio = Priority::DEFAULT;

examples/examples/z_pull.rs

@@ -20,7 +20,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, key_expr, size, interval) = parse_args();
 

examples/examples/z_put.rs

@@ -18,7 +18,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, key_expr, payload) = parse_args();
 

examples/examples/z_put_float.rs

@@ -18,7 +18,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, key_expr, payload) = parse_args();
 

examples/examples/z_queryable.rs

@@ -18,7 +18,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, key_expr, payload, complete) = parse_args();
 

examples/examples/z_queryable_shm.rs

@@ -29,7 +29,7 @@ const N: usize = 10;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, key_expr, payload, complete) = parse_args();
 

examples/examples/z_scout.rs

@@ -16,7 +16,7 @@ use zenoh::{config::WhatAmI, scout, Config};
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     println!("Scouting...");
     let receiver = scout(WhatAmI::Peer | WhatAmI::Router, Config::default())

examples/examples/z_storage.rs

@@ -28,7 +28,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, key_expr, complete) = parse_args();
 

examples/examples/z_sub.rs

@@ -18,7 +18,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // Initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, key_expr) = parse_args();
 

examples/examples/z_sub_liveliness.rs

@@ -18,7 +18,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // Initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, key_expr, history) = parse_args();
 

examples/examples/z_sub_shm.rs

@@ -20,7 +20,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // Initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, key_expr) = parse_args();
 

examples/examples/z_sub_thr.rs

@@ -69,7 +69,7 @@ impl Drop for Stats {
 
 fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_log_from_env_or("error");
 
     let (config, m, n) = parse_args();
 

io/zenoh-transport/tests/endpoints.rs

@@ -100,7 +100,7 @@ async fn run(endpoints: &[EndPoint]) {
 #[cfg(feature = "transport_tcp")]
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn endpoint_tcp() {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
     // Define the locators
     let endpoints: Vec<EndPoint> = vec![
         format!("tcp/127.0.0.1:{}", 7000).parse().unwrap(),
@@ -113,7 +113,7 @@ async fn endpoint_tcp() {
 #[cfg(feature = "transport_udp")]
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn endpoint_udp() {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
     // Define the locators
     let endpoints: Vec<EndPoint> = vec![
         format!("udp/127.0.0.1:{}", 7010).parse().unwrap(),
@@ -126,7 +126,7 @@ async fn endpoint_udp() {
 #[cfg(all(feature = "transport_unixsock-stream", target_family = "unix"))]
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn endpoint_unix() {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
     // Remove the files if they still exists
     let f1 = "zenoh-test-unix-socket-0.sock";
     let f2 = "zenoh-test-unix-socket-1.sock";
@@ -147,7 +147,7 @@ async fn endpoint_unix() {
 #[cfg(feature = "transport_ws")]
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn endpoint_ws() {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
     // Define the locators
     let endpoints: Vec<EndPoint> = vec![
         format!("ws/127.0.0.1:{}", 7020).parse().unwrap(),
@@ -160,7 +160,7 @@ async fn endpoint_ws() {
 #[cfg(feature = "transport_unixpipe")]
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn endpoint_unixpipe() {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
     // Define the locators
     let endpoints: Vec<EndPoint> = vec![
         "unixpipe/endpoint_unixpipe".parse().unwrap(),
@@ -174,7 +174,7 @@ async fn endpoint_unixpipe() {
 #[cfg(all(feature = "transport_tcp", feature = "transport_udp"))]
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn endpoint_tcp_udp() {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
     // Define the locators
     let endpoints: Vec<EndPoint> = vec![
         format!("tcp/127.0.0.1:{}", 7030).parse().unwrap(),
@@ -193,7 +193,7 @@ async fn endpoint_tcp_udp() {
 ))]
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn endpoint_tcp_udp_unix() {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
     // Remove the file if it still exists
     let f1 = "zenoh-test-unix-socket-2.sock";
     let _ = std::fs::remove_file(f1);
@@ -217,7 +217,7 @@ async fn endpoint_tcp_udp_unix() {
 ))]
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn endpoint_tcp_unix() {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
     // Remove the file if it still exists
     let f1 = "zenoh-test-unix-socket-3.sock";
     let _ = std::fs::remove_file(f1);
@@ -239,7 +239,7 @@ async fn endpoint_tcp_unix() {
 ))]
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn endpoint_udp_unix() {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
     // Remove the file if it still exists
     let f1 = "zenoh-test-unix-socket-4.sock";
     let _ = std::fs::remove_file(f1); // Define the locators
@@ -258,7 +258,7 @@ async fn endpoint_udp_unix() {
 async fn endpoint_tls() {
     use zenoh_link::tls::config::*;
 
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
 
     // NOTE: this an auto-generated pair of certificate and key.
     //       The target domain is localhost, so it has no real
@@ -337,7 +337,7 @@ AXVFFIgCSluyrolaD6CWD9MqOex4YOfJR2bNxI7lFvuK4AwjyUJzT1U1HXib17mM
 async fn endpoint_quic() {
     use zenoh_link::quic::config::*;
 
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
 
     // NOTE: this an auto-generated pair of certificate and key.
     //       The target domain is localhost, so it has no real
@@ -413,7 +413,7 @@ AXVFFIgCSluyrolaD6CWD9MqOex4YOfJR2bNxI7lFvuK4AwjyUJzT1U1HXib17mM
 #[cfg(all(feature = "transport_vsock", target_os = "linux"))]
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn endpoint_vsock() {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
     // Define the locators
     let endpoints: Vec<EndPoint> = vec![
         "vsock/-1:1234".parse().unwrap(),

io/zenoh-transport/tests/multicast_compression.rs

@@ -335,7 +335,7 @@ mod tests {
     #[cfg(feature = "transport_udp")]
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     async fn transport_multicast_compression_udp_only() {
-        zenoh_util::try_init_log_from_env();
+        zenoh_util::init_log_from_env_or("error");
 
         // Define the locator
         let endpoints: Vec<EndPoint> = vec![

io/zenoh-transport/tests/multicast_transport.rs

@@ -332,7 +332,7 @@ mod tests {
     #[cfg(all(feature = "transport_compression", feature = "transport_udp"))]
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     async fn transport_multicast_udp_only() {
-        zenoh_util::try_init_log_from_env();
+        zenoh_util::init_log_from_env_or("error");
 
         // Define the locator
         let endpoints: Vec<EndPoint> = vec![

io/zenoh-transport/tests/transport_whitelist.rs

@@ -118,7 +118,7 @@ async fn run(endpoints: &[EndPoint]) {
 #[cfg(feature = "transport_tcp")]
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn transport_whitelist_tcp() {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
 
     // Define the locators
     let endpoints: Vec<EndPoint> = vec![
@@ -133,7 +133,7 @@ async fn transport_whitelist_tcp() {
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 #[ignore]
 async fn transport_whitelist_unixpipe() {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
 
     // Define the locators
     let endpoints: Vec<EndPoint> = vec![
@@ -147,7 +147,7 @@ async fn transport_whitelist_unixpipe() {
 #[cfg(all(feature = "transport_vsock", target_os = "linux"))]
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn transport_whitelist_vsock() {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_log_from_env_or("error");
 
     // Define the locators
     let endpoints: Vec<EndPoint> = vec![