From d593eedf01927f7e9d48210bc90683ef103a3e74 Mon Sep 17 00:00:00 2001 From: CleverWild Date: Fri, 3 Apr 2026 01:37:12 +0200 Subject: [PATCH] housekeeping(cli): move DEFAULT_SERVER_PORT upper to exports scope --- server/crates/arbiter-proto/src/lib.rs | 1 + server/crates/arbiter-server/src/cli.rs | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/server/crates/arbiter-proto/src/lib.rs b/server/crates/arbiter-proto/src/lib.rs index 1fabc1c..87644f6 100644 --- a/server/crates/arbiter-proto/src/lib.rs +++ b/server/crates/arbiter-proto/src/lib.rs @@ -31,6 +31,7 @@ pub struct ClientMetadata { } pub static BOOTSTRAP_PATH: &str = "bootstrap_token"; +pub const DEFAULT_SERVER_PORT: u16 = 50051; static HOME_OVERRIDE: LazyLock>> = LazyLock::new(|| RwLock::new(None)); pub fn set_home_path_override(path: Option) -> Result<(), std::io::Error> { diff --git a/server/crates/arbiter-server/src/cli.rs b/server/crates/arbiter-server/src/cli.rs index 53ba186..424260c 100644 --- a/server/crates/arbiter-server/src/cli.rs +++ b/server/crates/arbiter-server/src/cli.rs @@ -1,8 +1,14 @@ -use std::{net::SocketAddr, path::PathBuf}; +use std::{ + net::{Ipv4Addr, SocketAddr, SocketAddrV4}, + path::PathBuf, +}; use clap::{Args, Parser, Subcommand}; -const DEFAULT_LISTEN_ADDR: &str = "127.0.0.1:50051"; +const DEFAULT_LISTEN_ADDR: SocketAddr = SocketAddr::V4(SocketAddrV4::new( + Ipv4Addr::LOCALHOST, + arbiter_proto::DEFAULT_SERVER_PORT, +)); #[derive(Debug, Parser)] #[command(name = "arbiter-server")] @@ -25,7 +31,7 @@ pub enum Command { #[derive(Debug, Clone, Args)] pub struct RunArgs { - #[arg(long, default_value = DEFAULT_LISTEN_ADDR)] + #[arg(long, default_value_t = DEFAULT_LISTEN_ADDR)] pub listen_addr: SocketAddr, #[arg(long)] pub data_dir: Option, @@ -34,9 +40,7 @@ pub struct RunArgs { impl Default for RunArgs { fn default() -> Self { Self { - listen_addr: DEFAULT_LISTEN_ADDR - .parse() - .expect("listen address literal must be valid"), + listen_addr: DEFAULT_LISTEN_ADDR, data_dir: None, } } @@ -61,7 +65,7 @@ pub struct ServiceInstallArgs { #[derive(Debug, Clone, Args)] pub struct ServiceRunArgs { - #[arg(long, default_value = DEFAULT_LISTEN_ADDR)] + #[arg(long, default_value_t = DEFAULT_LISTEN_ADDR)] pub listen_addr: SocketAddr, #[arg(long)] pub data_dir: Option,