handle dns server starting error

shiroedev2024 · Apr 30, 2024 · a042395 · a042395
1 parent 631254a
commit a042395
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: local local-dev test proto-gen
+.PHONY: cli cli-dev test proto-gen
 
 CFG_COMMIT_HASH := $(shell git rev-parse HEAD | cut -c 1-7)
 export CFG_COMMIT_HASH := $(CFG_COMMIT_HASH)

diff --git a/leaf/src/lib.rs b/leaf/src/lib.rs
@@ -24,6 +24,7 @@ use notify::{
 
 #[cfg(all(feature = "inbound-tun", any(target_os = "macos", target_os = "linux", target_os = "windows")))]
 use tproxy_config::{TproxyState, TproxyArgs};
+use tracing_subscriber::fmt::format;
 
 use app::{
     dispatcher::Dispatcher, dns_client::DnsClient, inbound::manager::InboundManager,
@@ -396,9 +397,10 @@ pub fn start(rt_id: RuntimeId, opts: StartOptions) -> Result<(), Error> {
 
     #[cfg(feature = "dns-server")]
     if config.dns.local_dns_server {
-        if let Ok(r) = app::dns_server::run_dns_server(config.dns.local_dns.to_owned()) {
-            runners.push(r);
-        };
+        runners.push(app::dns_server::run_dns_server(config.dns.local_dns.to_owned()).map_err(|e| Error::Io(io::Error::new(
+            io::ErrorKind::Other,
+            format!("failed to start dns server: {}", e)
+        )))?);
     }
 
     let dns_client = Arc::new(RwLock::new(