From 40255fce93fe4751c7b2047ae347bd749ce7fefc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D1=80=D0=B8=D0=B3=D0=BE=D1=80=D0=B8=D0=B9=20=D0=A1?= =?UTF-8?q?=D0=B0=D1=84=D1=80=D0=BE=D0=BD=D0=BE=D0=B2?= Date: Tue, 1 Jul 2025 19:42:24 +0000 Subject: [PATCH] Update futriix-server/src/main.rs --- futriix-server/src/main.rs | 41 ++++++-------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) diff --git a/futriix-server/src/main.rs b/futriix-server/src/main.rs index 6d0ac2f..009bf49 100644 --- a/futriix-server/src/main.rs +++ b/futriix-server/src/main.rs @@ -4,47 +4,18 @@ use server::*; use std::fs; use toml::Value; use simplelog::*; -use clap::Parser; - -#[derive(Parser, Debug)] -#[command(author, version, about, long_about = None)] -struct Args { - /// Port to listen on - #[arg(short, long, default_value_t = 8080)] - port: u16, - - /// Replication peer address - #[arg(long)] - replication_peer: Option, - - /// Config file path - #[arg(short, long, default_value = "futriix.config.toml")] - config: String, -} #[tokio::main] async fn main() -> Result<(), Box> { - let args = Args::parse(); - - // Read config - let config_content = fs::read_to_string(&args.config)?; - let mut config: Value = toml::from_str(&config_content)?; - - // Override config with command line args - if let Some(peer) = args.replication_peer { - config["replication"]["enabled"] = Value::Boolean(true); - if let Some(peers) = config["replication"]["peer_nodes"].as_array_mut() { - peers.push(Value::String(peer)); - } else { - config["replication"]["peer_nodes"] = Value::Array(vec![Value::String(peer)]); - } - } + // Чтение конфигурации + let config_content = fs::read_to_string("futriix.config.toml")?; + let config: Value = toml::from_str(&config_content)?; let ip = config["server"]["ip"].as_str().unwrap_or("127.0.0.1"); - let port = args.port; + let port = config["server"]["port"].as_integer().unwrap_or(8080) as u16; let log_path = config["server"]["log_path"].as_str().unwrap_or("futriix.log"); - // Initialize logger + // Инициализация логгера let log_file = fs::File::create(log_path)?; CombinedLogger::init(vec![ TermLogger::new( @@ -60,7 +31,7 @@ async fn main() -> Result<(), Box> { ), ])?; - // Start server + // Запуск сервера let server = FutriixServer::new(&config); let addr = format!("{}:{}", ip, port); server.run(&addr).await?;