From ae80b84e22621356a5dc6124218c8b477b9bb4e1 Mon Sep 17 00:00:00 2001 From: Aaron Chen Date: Thu, 19 Mar 2026 19:07:24 +0800 Subject: [PATCH] fix: remove unnecessary double checks in PingBalancer (#2093) --- .../src/local/loadbalancing/ping_balancer.rs | 44 +++++++++---------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs b/crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs index e5fa4b24..1cd9ddf5 100644 --- a/crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs +++ b/crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs @@ -560,18 +560,16 @@ impl PingBalancerContext { self.best_tcp_idx.store(best_idx, Ordering::Release); if best_idx != old_best_idx { - if best_idx != old_best_idx { - info!( - "switched best TCP server from {} to {} (best check)", - ServerConfigFormatter::new(servers[old_best_idx].server_config()), - ServerConfigFormatter::new(servers[best_idx].server_config()) - ); - } else { - debug!( - "kept best TCP server {} (best check)", - ServerConfigFormatter::new(servers[old_best_idx].server_config()) - ); - } + info!( + "switched best TCP server from {} to {} (best check)", + ServerConfigFormatter::new(servers[old_best_idx].server_config()), + ServerConfigFormatter::new(servers[best_idx].server_config()) + ); + } else { + debug!( + "kept best TCP server {} (best check)", + ServerConfigFormatter::new(servers[old_best_idx].server_config()) + ); } } @@ -590,18 +588,16 @@ impl PingBalancerContext { self.best_udp_idx.store(best_idx, Ordering::Release); if best_idx != old_best_idx { - if best_idx != old_best_idx { - info!( - "switched best UDP server from {} to {} (best check)", - ServerConfigFormatter::new(servers[old_best_idx].server_config()), - ServerConfigFormatter::new(servers[best_idx].server_config()) - ); - } else { - debug!( - "kept best UDP server {} (best check)", - ServerConfigFormatter::new(servers[old_best_idx].server_config()) - ); - } + info!( + "switched best UDP server from {} to {} (best check)", + ServerConfigFormatter::new(servers[old_best_idx].server_config()), + ServerConfigFormatter::new(servers[best_idx].server_config()) + ); + } else { + debug!( + "kept best UDP server {} (best check)", + ServerConfigFormatter::new(servers[old_best_idx].server_config()) + ); } } }