MarketTakers/arbiter
5
0
Fork 0
Code Issues 27 Pull Requests 5 Packages Projects Releases Wiki Activity

refactor(server): extract shared runtime and implement service install/run in arbiter-server.exe #44

Open
CleverWild wants to merge 6 commits from win-service into main
pull from: win-service
merge into: MarketTakers:main
Conversation 2 Commits 6 Files Changed 9 +12 -7
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d593eedf01 - Show all commits

1
server/crates/arbiter-proto/src/lib.rs
View File

@@ -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<RwLock<Option<PathBuf>>> = LazyLock::new(|| RwLock::new(None));
pub fn set_home_path_override(path: Option<PathBuf>) -> Result<(), std::io::Error> {

18
server/crates/arbiter-server/src/cli.rs
View File

@@ -1,8 +1,14 @@
use std::{net::SocketAddr, path::PathBuf};
use std::{
net::{Ipv4Addr, SocketAddr, SocketAddrV4},
path::PathBuf,
};
CleverWild marked this conversation as resolved
Skipper commented 2026-04-02 18:54:44 +00:00
Review
Copy Link

there was a port hardcoded in arbiter-proto. use that instead

there was a port hardcoded in arbiter-proto. use that instead
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<PathBuf>,
@@ -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<PathBuf>,