Fix scout() returning locator 0.0.0.0:7447 and improve zenohd logs

eclipse-zenoh · Oct 1, 2020 · 7304d8d · 7304d8d
1 parent 6f52dae
commit 7304d8d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/zenoh-router/Cargo.toml b/zenoh-router/Cargo.toml
@@ -46,7 +46,7 @@ clap = "2"
 serde_json = { version = "1.0", features = ["preserve_order"] }
 socket2 = "0.3.12"
 uhlc = "0.2"
-zenoh-protocol =  { version = "0.5.0-beta.2", path = "../zenoh-protocol" }
+zenoh-protocol =  { version = "0.5.0-beta.2", path = "../zenoh-protocol", features = ["tcp", "udp"] }
 zenoh-util =  { version = "0.5.0-beta.2", path = "../zenoh-util" }
 hex = "0.4"
 

diff --git a/zenoh-router/src/runtime/orchestrator.rs b/zenoh-router/src/runtime/orchestrator.rs
@@ -155,7 +155,7 @@ impl SessionOrchestrator {
     async fn bind_listeners(&self, listeners: &[Locator]) -> ZResult<()> {
         for locator in listeners {
             match self.manager.add_locator(&locator).await {
-                Ok(locator) => log::info!("Listening on {}!", locator),
+                Ok(locator) => log::debug!("Locator {} added", locator),
                 Err(err) => {
                     log::error!("Unable to open listener {} : {}", locator, err);
                     return zerror!(
@@ -167,6 +167,9 @@ impl SessionOrchestrator {
                 }
             }
         }
+        for locator in self.get_local_locators().await {
+            log::info!("zenohd can be reached on {}", locator);
+        }
         Ok(())
     }
 
@@ -264,6 +267,11 @@ impl SessionOrchestrator {
                 );
             }
         }
+        log::info!(
+            "zenohd listening scout messages on {}:{}",
+            MCAST_ADDR,
+            MCAST_PORT
+        );
         Ok(socket.into_udp_socket().into())
     }
 
@@ -442,7 +450,6 @@ impl SessionOrchestrator {
         let mut result = vec![];
         for locator in self.manager.get_locators().await {
             match locator {
-                #[cfg(feature = "tcp")]
                 Locator::Tcp(addr) => {
                     if addr.ip() == Ipv4Addr::new(0, 0, 0, 0) {
                         match zenoh_util::net::get_local_addresses() {