From c9e8c35e77f57b1db4ad8fbaa03b02fe3ca78398 Mon Sep 17 00:00:00 2001 From: "Sijie.Sun" Date: Sat, 20 Sep 2025 00:20:08 +0800 Subject: [PATCH] fix log dir not work; fix stun config from file not work; (#1393) --- easytier/src/easytier-core.rs | 13 +++++++++++-- easytier/src/utils.rs | 7 ++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/easytier/src/easytier-core.rs b/easytier/src/easytier-core.rs index ab211a1..527c902 100644 --- a/easytier/src/easytier-core.rs +++ b/easytier/src/easytier-core.rs @@ -968,8 +968,17 @@ impl NetworkOptions { old_udp_whitelist.extend(self.udp_whitelist.clone()); cfg.set_udp_whitelist(old_udp_whitelist); - cfg.set_stun_servers(self.stun_servers.clone()); - cfg.set_stun_servers_v6(self.stun_servers_v6.clone()); + if let Some(stun_servers) = &self.stun_servers { + let mut old_stun_servers = cfg.get_stun_servers().unwrap_or_default(); + old_stun_servers.extend(stun_servers.iter().cloned()); + cfg.set_stun_servers(Some(old_stun_servers)); + } + + if let Some(stun_servers_v6) = &self.stun_servers_v6 { + let mut old_stun_servers_v6 = cfg.get_stun_servers_v6().unwrap_or_default(); + old_stun_servers_v6.extend(stun_servers_v6.iter().cloned()); + cfg.set_stun_servers_v6(Some(old_stun_servers_v6)); + } Ok(()) } } diff --git a/easytier/src/utils.rs b/easytier/src/utils.rs index 58c5305..9a3bc0f 100644 --- a/easytier/src/utils.rs +++ b/easytier/src/utils.rs @@ -81,9 +81,14 @@ pub fn init_logger( }); } + let dir = file_config.dir.as_deref().unwrap_or("."); + let file = file_config.file.as_deref().unwrap_or("easytier.log"); + let path = std::path::Path::new(dir).join(file); + let path_str = path.to_string_lossy().into_owned(); + let builder = RollingFileAppenderBase::builder(); let file_appender = builder - .filename(file_config.file.unwrap_or("easytier.log".to_string())) + .filename(path_str) .condition_daily() .max_filecount(file_config.count.unwrap_or(10)) .condition_max_file_size(file_config.size_mb.unwrap_or(100) * 1024 * 1024)