From 51c93411aff96bec031e27c955ce9d4d9738e0ee Mon Sep 17 00:00:00 2001 From: lxien Date: Wed, 23 Sep 2026 21:45:07 +0800 Subject: [PATCH] chore: improve code log messages --- Cargo.toml | 2 +- .../io/github/lxien/orbien/client/OrbienClientConfig.java | 2 -- core/src/transport/websocket.rs | 2 +- server/src/control/session/register.rs | 1 - server/src/dashboard/routes.rs | 1 - server/src/service/ingress.rs | 2 +- server/src/service/mod.rs | 6 +++--- server/src/service/session_registry.rs | 4 ++-- server/src/tunnel/ports.rs | 1 - 9 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7f068d0..64cc680 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ version = "3.6.1-beta.1" edition = "2021" license = "Apache-2.0" -authors = ["orbien"] +authors = ["orbien-org","lxien"] [profile.release] diff --git a/client-java/orbien-client/src/main/java/io/github/lxien/orbien/client/OrbienClientConfig.java b/client-java/orbien-client/src/main/java/io/github/lxien/orbien/client/OrbienClientConfig.java index 8c43bf8..e423d7a 100644 --- a/client-java/orbien-client/src/main/java/io/github/lxien/orbien/client/OrbienClientConfig.java +++ b/client-java/orbien-client/src/main/java/io/github/lxien/orbien/client/OrbienClientConfig.java @@ -7,9 +7,7 @@ import java.util.Objects; public final class OrbienClientConfig { private static final String DEFAULT_SERVER = "127.0.0.1:9527"; private static final int DEFAULT_PORT = 9527; - private String server = DEFAULT_SERVER; - private String token = ""; private boolean tcpMux = false; private int poolCount = 1; diff --git a/core/src/transport/websocket.rs b/core/src/transport/websocket.rs index 2958a38..abffa15 100644 --- a/core/src/transport/websocket.rs +++ b/core/src/transport/websocket.rs @@ -28,7 +28,7 @@ pub fn is_websocket_http_request(peeked: &[u8], path: &str) -> bool { pub async fn accept_websocket(stream: TcpStream) -> Result { let ws = accept_async(stream) .await - .context("websocket server accept/upgrade")?; + .context("websocket server accept or upgrade")?; Ok(WsByteStream::new(ws).boxed()) } diff --git a/server/src/control/session/register.rs b/server/src/control/session/register.rs index a8a8aa8..970e0d0 100644 --- a/server/src/control/session/register.rs +++ b/server/src/control/session/register.rs @@ -13,7 +13,6 @@ impl Control { self.metrics .new_tunnel(name, tunnel_type, &self.user, &self.session_id); } - fn tunnel_transport(np: &NewTunnel) -> Result>> { let limiter = orbien_core::limit::limiter_if_side( np.bandwidth, diff --git a/server/src/dashboard/routes.rs b/server/src/dashboard/routes.rs index ccf2431..916d838 100644 --- a/server/src/dashboard/routes.rs +++ b/server/src/dashboard/routes.rs @@ -20,7 +20,6 @@ use std::sync::Arc; #[derive(Embed)] #[folder = "assets/"] struct Assets; - pub fn router(state: Arc) -> Router { Router::new() .route("/healthz", get(|| async { "ok" })) diff --git a/server/src/service/ingress.rs b/server/src/service/ingress.rs index 77aff60..395cd4c 100644 --- a/server/src/service/ingress.rs +++ b/server/src/service/ingress.rs @@ -14,7 +14,7 @@ impl Service { let svc = Arc::clone(&self); tokio::spawn(async move { if let Err(e) = svc.handle_tcp_or_websocket(stream, peer).await { - tracing::warn!(%peer, error = %e, "tcp/ws connection closed with error"); + tracing::warn!(%peer, error = %e, "tcp or ws connection closed with error"); } }); } diff --git a/server/src/service/mod.rs b/server/src/service/mod.rs index c116279..07cfdef 100644 --- a/server/src/service/mod.rs +++ b/server/src/service/mod.rs @@ -82,7 +82,7 @@ impl Service { %tcp_addr, ws_path = %this.cfg.transport.ws_path, tcp_mux = this.cfg.transport.tcp_mux, - "tcp/websocket control/data listener ready" + "tcp or websocket control or data listener ready" ); let gw_shutdown = Arc::new(Notify::new()); @@ -127,7 +127,7 @@ impl Service { &this.cfg.transport.tls.key_file, &this.cfg.transport.tls.trusted_ca_file, )?; - tracing::info!(%quic_addr, "quic control/data listener ready"); + tracing::info!(%quic_addr, "quic control or data listener ready"); let svc = Arc::clone(&this); set.spawn(async move { svc.run_quic(endpoint).await }); } @@ -140,7 +140,7 @@ impl Service { tracing::info!( %kcp_addr, tcp_mux = this.cfg.transport.tcp_mux, - "kcp control/data listener ready" + "kcp control or data listener ready" ); let svc = Arc::clone(&this); set.spawn(async move { svc.run_kcp(listener).await }); diff --git a/server/src/service/session_registry.rs b/server/src/service/session_registry.rs index f6bc7a9..af8b442 100644 --- a/server/src/service/session_registry.rs +++ b/server/src/service/session_registry.rs @@ -172,7 +172,7 @@ impl Service { nw: NewDataConn, ) -> Result<()> { if nw.session_id.trim().is_empty() { - return Err(anyhow!("empty session_id for data conn")); + return Err(anyhow!("empty session_id for data connection")); } if let Err(reason) = auth::verify_auth_digest( &self.cfg.auth.token, @@ -198,7 +198,7 @@ impl Service { Ok(()) } None => Err(anyhow!( - "no accepting control for data conn session_id={}", + "no accepting control for data connection session_id={}", nw.session_id )), } diff --git a/server/src/tunnel/ports.rs b/server/src/tunnel/ports.rs index 4662452..a706a8a 100644 --- a/server/src/tunnel/ports.rs +++ b/server/src/tunnel/ports.rs @@ -11,7 +11,6 @@ impl PortTable { pub fn new() -> Self { Self::default() } - pub fn claim(&self, port: u16, tunnel_name: &str) -> Result<()> { if port == 0 { return Err(anyhow!("invalid remote port 0"));