From 7501e367c6c94907bacfdfc3678259b7aed4c162 Mon Sep 17 00:00:00 2001 From: Ara Sadoyan Date: Sun, 16 Mar 2025 19:34:20 +0100 Subject: [PATCH] temp remove command line arg parser --- etc/upstreams.yaml | 4 +++- src/web/start.rs | 32 ++++++++++++++++---------------- start.sh | 4 ++-- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/etc/upstreams.yaml b/etc/upstreams.yaml index f13efdf..255082d 100644 --- a/etc/upstreams.yaml +++ b/etc/upstreams.yaml @@ -12,12 +12,14 @@ upstreams: servers: - "127.0.0.1:8000" - "127.0.0.3:8000" + - "127.0.0.4:8000" + - "127.0.0.5:8000" "/ping": protocol: "http" ssl: false servers: - "127.0.0.1:8000" - - "127.0.0.4:8000" + - "127.0.0.2:8000" polo.netangels.net: paths: "/": diff --git a/src/web/start.rs b/src/web/start.rs index c0fa092..71dc367 100644 --- a/src/web/start.rs +++ b/src/web/start.rs @@ -1,25 +1,25 @@ use crate::utils::tools::*; use crate::web::proxyhttp::LB; -use clap::{arg, Parser}; +// use clap::{arg, Parser}; use dashmap::DashMap; -use log::info; -use pingora_core::prelude::background_service; +use pingora_core::prelude::{background_service, Opt}; use pingora_core::server::Server; use std::sync::Arc; -#[derive(Parser, Debug)] -#[command(version, about, long_about = None)] -struct Args { - #[arg(short, long)] - address: String, - #[arg(short, long)] - port: String, -} +// #[derive(Parser, Debug)] +// #[command(version, about, long_about = None)] +// struct Args { +// #[arg(short, long)] +// address: String, +// #[arg(short, long)] +// port: String, +// } pub fn run() { env_logger::init(); - let mut server = Server::new(None).unwrap(); + // let mut server = Server::new(None).unwrap(); + let mut server = Server::new(Some(Opt::parse_args())).unwrap(); server.bootstrap(); let uf: UpstreamsDashMap = DashMap::new(); @@ -39,13 +39,13 @@ pub fn run() { let bg_srvc = background_service("bgsrvc", bg); let mut proxy = pingora_proxy::http_proxy_service(&server.configuration, lb); - let args = Args::parse(); - let addr = format!("{}:{}", args.address, args.port); - proxy.add_tcp(&addr); + // let args = Args::parse(); + // let addr = format!("{}:{}", args.address, args.port); + proxy.add_tcp("0.0.0.0:6193"); server.add_service(proxy); server.add_service(bg_srvc); - info!("Starting Gazan server on {}, port : {} !", args.address, args.port); + // info!("Starting Gazan server on {}, port : {} !", args.address, args.port); server.run_forever(); } diff --git a/start.sh b/start.sh index 5cfd3f4..548a188 100755 --- a/start.sh +++ b/start.sh @@ -1,4 +1,4 @@ #!/bin/bash export RUST_LOG=INFO -reflex -d none -r 'src/' -s -- sh -c 'reset && cargo run -- --address 0.0.0.0 --port 6193' - +#reflex -d none -r 'src/' -s -- sh -c 'reset && cargo run -- --address 0.0.0.0 --port 6193' +reflex -d none -r 'src/' -s -- sh -c 'reset && cargo run -- -c etc/main.yaml'