housekeeping(cli): move DEFAULT_SERVER_PORT upper to exports scope

This commit is contained in:
CleverWild
2026-04-03 01:37:12 +02:00
parent 2fb5bb3d84
commit d593eedf01
2 changed files with 12 additions and 7 deletions

View File

@@ -31,6 +31,7 @@ pub struct ClientMetadata {
} }
pub static BOOTSTRAP_PATH: &str = "bootstrap_token"; pub static BOOTSTRAP_PATH: &str = "bootstrap_token";
pub const DEFAULT_SERVER_PORT: u16 = 50051;
static HOME_OVERRIDE: LazyLock<RwLock<Option<PathBuf>>> = LazyLock::new(|| RwLock::new(None)); static HOME_OVERRIDE: LazyLock<RwLock<Option<PathBuf>>> = LazyLock::new(|| RwLock::new(None));
pub fn set_home_path_override(path: Option<PathBuf>) -> Result<(), std::io::Error> { pub fn set_home_path_override(path: Option<PathBuf>) -> Result<(), std::io::Error> {

View File

@@ -1,8 +1,14 @@
use std::{net::SocketAddr, path::PathBuf}; use std::{
net::{Ipv4Addr, SocketAddr, SocketAddrV4},
path::PathBuf,
};
use clap::{Args, Parser, Subcommand}; 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)] #[derive(Debug, Parser)]
#[command(name = "arbiter-server")] #[command(name = "arbiter-server")]
@@ -25,7 +31,7 @@ pub enum Command {
#[derive(Debug, Clone, Args)] #[derive(Debug, Clone, Args)]
pub struct RunArgs { pub struct RunArgs {
#[arg(long, default_value = DEFAULT_LISTEN_ADDR)] #[arg(long, default_value_t = DEFAULT_LISTEN_ADDR)]
pub listen_addr: SocketAddr, pub listen_addr: SocketAddr,
#[arg(long)] #[arg(long)]
pub data_dir: Option<PathBuf>, pub data_dir: Option<PathBuf>,
@@ -34,9 +40,7 @@ pub struct RunArgs {
impl Default for RunArgs { impl Default for RunArgs {
fn default() -> Self { fn default() -> Self {
Self { Self {
listen_addr: DEFAULT_LISTEN_ADDR listen_addr: DEFAULT_LISTEN_ADDR,
.parse()
.expect("listen address literal must be valid"),
data_dir: None, data_dir: None,
} }
} }
@@ -61,7 +65,7 @@ pub struct ServiceInstallArgs {
#[derive(Debug, Clone, Args)] #[derive(Debug, Clone, Args)]
pub struct ServiceRunArgs { pub struct ServiceRunArgs {
#[arg(long, default_value = DEFAULT_LISTEN_ADDR)] #[arg(long, default_value_t = DEFAULT_LISTEN_ADDR)]
pub listen_addr: SocketAddr, pub listen_addr: SocketAddr,
#[arg(long)] #[arg(long)]
pub data_dir: Option<PathBuf>, pub data_dir: Option<PathBuf>,