feat: rename zenoh::try_init_log_from_env to zenoh::init_logging

eclipse-zenoh · Jun 19, 2024 · 4a314a6 · 4a314a6
1 parent 86490c1
commit 4a314a6
Show file tree

Hide file tree

Showing 35 changed files with 66 additions and 62 deletions.
diff --git a/examples/examples/z_alloc_shm.rs b/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_logging();
     run().await.unwrap()
 }
 

diff --git a/examples/examples/z_delete.rs b/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_logging();
 
     let (config, key_expr) = parse_args();
 

diff --git a/examples/examples/z_forward.rs b/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_logging();
 
     let (config, key_expr, forward) = parse_args();
 

diff --git a/examples/examples/z_get.rs b/examples/examples/z_get.rs
@@ -20,7 +20,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_logging();
 
     let (config, selector, payload, target, timeout) = parse_args();
 

diff --git a/examples/examples/z_get_liveliness.rs b/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_logging();
 
     let (config, key_expr, timeout) = parse_args();
 

diff --git a/examples/examples/z_get_shm.rs b/examples/examples/z_get_shm.rs
@@ -30,7 +30,7 @@ const N: usize = 10;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_logging();
 
     let (mut config, selector, mut payload, target, timeout) = parse_args();
 

diff --git a/examples/examples/z_info.rs b/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_logging();
 
     let config = parse_args();
 

diff --git a/examples/examples/z_liveliness.rs b/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_logging();
 
     let (config, key_expr) = parse_args();
 

diff --git a/examples/examples/z_ping.rs b/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_logging();
 
     let (config, warmup, size, n, express) = parse_args();
     let session = zenoh::open(config).wait().unwrap();

diff --git a/examples/examples/z_ping_shm.rs b/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_logging();
 
     let (mut config, warmup, size, n) = parse_args();
 

diff --git a/examples/examples/z_pong.rs b/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_logging();
 
     let (mut config, express) = parse_args();
 

diff --git a/examples/examples/z_pub.rs b/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_logging();
 
     let (config, key_expr, payload, attachment) = parse_args();
 

diff --git a/examples/examples/z_pub_shm.rs b/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_logging();
 
     let (mut config, path, payload) = parse_args();
 

diff --git a/examples/examples/z_pub_shm_thr.rs b/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_logging();
     let (mut config, sm_size, size) = parse_args();
 
     // A probing procedure for shared memory is performed upon session opening. To enable `z_pub_shm_thr` to operate

diff --git a/examples/examples/z_pub_thr.rs b/examples/examples/z_pub_thr.rs
@@ -20,7 +20,7 @@ use zenoh_examples::CommonArgs;
 
 fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_logging();
     let args = Args::parse();
 
     let mut prio = Priority::DEFAULT;

diff --git a/examples/examples/z_pull.rs b/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_logging();
 
     let (config, key_expr, size, interval) = parse_args();
 

diff --git a/examples/examples/z_put.rs b/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_logging();
 
     let (config, key_expr, payload) = parse_args();
 

diff --git a/examples/examples/z_put_float.rs b/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_logging();
 
     let (config, key_expr, payload) = parse_args();
 

diff --git a/examples/examples/z_queryable.rs b/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_logging();
 
     let (mut config, key_expr, payload, complete) = parse_args();
 

diff --git a/examples/examples/z_queryable_shm.rs b/examples/examples/z_queryable_shm.rs
@@ -28,7 +28,7 @@ const N: usize = 10;
 #[tokio::main]
 async fn main() {
     // initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_logging();
 
     let (mut config, key_expr, payload, complete) = parse_args();
 

diff --git a/examples/examples/z_scout.rs b/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_logging();
 
     println!("Scouting...");
     let receiver = scout(WhatAmI::Peer | WhatAmI::Router, Config::default())

diff --git a/examples/examples/z_storage.rs b/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_logging();
 
     let (config, key_expr, complete) = parse_args();
 

diff --git a/examples/examples/z_sub.rs b/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_logging();
 
     let (mut config, key_expr) = parse_args();
 

diff --git a/examples/examples/z_sub_liveliness.rs b/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_logging();
 
     let (config, key_expr) = parse_args();
 

diff --git a/examples/examples/z_sub_shm.rs b/examples/examples/z_sub_shm.rs
@@ -18,7 +18,7 @@ use zenoh_examples::CommonArgs;
 #[tokio::main]
 async fn main() {
     // Initiate logging
-    zenoh::try_init_log_from_env();
+    zenoh::init_logging();
 
     let (mut config, key_expr) = parse_args();
 

diff --git a/examples/examples/z_sub_thr.rs b/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_logging();
 
     let (mut config, m, n) = parse_args();
 

diff --git a/zenoh/src/lib.rs b/zenoh/src/lib.rs
@@ -112,14 +112,16 @@ pub const FEATURES: &str = zenoh_util::concat_enabled_features!(
 );
 
 #[doc(inline)]
-pub use {
-    crate::{
-        config::Config,
-        core::{Error, Result},
-        scouting::scout,
-        session::{open, Session},
-    },
-    zenoh_util::{init_log_from_env_or, try_init_log_from_env},
+pub use zenoh_util::{
+    init_log_from_env_or as init_logging_with, try_init_log_from_env as init_logging,
+};
+
+#[doc(inline)]
+pub use crate::{
+    config::Config,
+    core::{Error, Result},
+    scouting::scout,
+    session::{open, Session},
 };
 
 pub mod prelude;
@@ -403,6 +405,8 @@ pub mod internal {
         };
     }
 
+    pub use zenoh_util::init_log_with_callback;
+
     pub use crate::api::value::Value;
 }
 

diff --git a/zenoh/tests/acl.rs b/zenoh/tests/acl.rs
@@ -34,7 +34,7 @@ mod test {
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     async fn test_acl() {
-        zenoh::try_init_log_from_env();
+        zenoh::init_logging();
         test_pub_sub_deny().await;
         test_pub_sub_allow().await;
         test_pub_sub_deny_then_allow().await;

diff --git a/zenoh/tests/interceptors.rs b/zenoh/tests/interceptors.rs
@@ -182,7 +182,7 @@ fn downsampling_by_keyexpr_impl(flow: InterceptorFlow) {
 
 #[test]
 fn downsampling_by_keyexpr() {
-    zenoh::try_init_log_from_env();
+    zenoh::init_logging();
     downsampling_by_keyexpr_impl(InterceptorFlow::Ingress);
     downsampling_by_keyexpr_impl(InterceptorFlow::Egress);
 }
@@ -235,15 +235,15 @@ fn downsampling_by_interface_impl(flow: InterceptorFlow) {
 #[cfg(unix)]
 #[test]
 fn downsampling_by_interface() {
-    zenoh::try_init_log_from_env();
+    zenoh::init_logging();
     downsampling_by_interface_impl(InterceptorFlow::Ingress);
     downsampling_by_interface_impl(InterceptorFlow::Egress);
 }
 
 #[test]
 #[should_panic(expected = "unknown variant `down`")]
 fn downsampling_config_error_wrong_strategy() {
-    zenoh::try_init_log_from_env();
+    zenoh::init_logging();
 
     let mut config = Config::default();
     config

diff --git a/zenoh/tests/matching.rs b/zenoh/tests/matching.rs
@@ -40,7 +40,7 @@ async fn create_session_pair(locator: &str) -> (Session, Session) {
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn zenoh_matching_status_any() -> ZResult<()> {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_logging();
     let (session1, session2) = create_session_pair("tcp/127.0.0.1:18001").await;
 
     let publisher1 = ztimeout!(session1
@@ -92,7 +92,7 @@ async fn zenoh_matching_status_any() -> ZResult<()> {
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn zenoh_matching_status_remote() -> ZResult<()> {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_logging();
 
     let session1 = ztimeout!(zenoh::open(config::peer())).unwrap();
     let session2 = ztimeout!(zenoh::open(config::peer())).unwrap();
@@ -147,7 +147,7 @@ async fn zenoh_matching_status_remote() -> ZResult<()> {
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn zenoh_matching_status_local() -> ZResult<()> {
-    zenoh_util::try_init_log_from_env();
+    zenoh_util::init_logging();
 
     let session1 = ztimeout!(zenoh::open(zenoh::config::peer())).unwrap();
     let session2 = ztimeout!(zenoh::open(zenoh::config::peer())).unwrap();