Merge branch 'main' into fix_7641

risingwavelabs · Feb 2, 2023 · 4353a0a · 4353a0a
2 parents 375893d + 83e7f00
commit 4353a0a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/meta/src/lib.rs b/src/meta/src/lib.rs
@@ -138,12 +138,13 @@ pub fn start(opts: MetaNodeOpts) -> Pin<Box<dyn Future<Output = ()> + Send>> {
         let config = load_config(&opts.config_path, Some(opts.override_opts));
         tracing::info!("Starting meta node with config {:?}", config);
         let listen_addr: SocketAddr = opts.listen_addr.parse().unwrap();
-        let meta_addr = opts.host.unwrap_or_else(|| opts.listen_addr.clone());
+        let meta_addr = opts
+            .host
+            .map(|host| format!("{}:{}", host, listen_addr.port()))
+            .unwrap_or_else(|| opts.listen_addr.clone());
         let dashboard_addr = opts.dashboard_host.map(|x| x.parse().unwrap());
         let prometheus_addr = opts.prometheus_host.map(|x| x.parse().unwrap());
-        let meta_endpoint = opts
-            .meta_endpoint
-            .unwrap_or_else(|| format!("{}:{}", meta_addr, listen_addr.port()));
+        let meta_endpoint = opts.meta_endpoint.unwrap_or(meta_addr);
         let backend = match config.meta.backend {
             MetaBackend::Etcd => MetaStoreBackend::Etcd {
                 endpoints: opts