From 1cda80c04198af781e77187a59e752f7055bdd1e Mon Sep 17 00:00:00 2001
From: Erik <erik_97@live.nl>
Date: Tue, 2 May 2023 10:45:16 +0200
Subject: [PATCH] Add command-line argument for control api endpoint

---
 src/bin/proxy.rs | 9 +++++++--
 src/lib.rs       | 4 +---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/bin/proxy.rs b/src/bin/proxy.rs
index 99392b3..b92f33c 100644
--- a/src/bin/proxy.rs
+++ b/src/bin/proxy.rs
@@ -3,11 +3,17 @@ use axum::{
     Router,
 };
 use proxima_centauri::{process_command, root, GlobalState};
-use std::{net::SocketAddr, sync::Arc};
+use std::sync::Arc;
 use tracing::Level;
 
 #[tokio::main]
 async fn main() {
+    let addr: std::net::SocketAddr = std::env::args()
+        .nth(1)
+        .unwrap_or_else(|| "127.0.0.1:14000".to_string())
+        .parse()
+        .unwrap();
+
     // initialize tracing
     let subscriber = tracing_subscriber::FmtSubscriber::builder()
         .with_max_level(Level::INFO)
@@ -27,7 +33,6 @@ async fn main() {
         .with_state(shared_state);
 
     // run our app with hyper
-    let addr = SocketAddr::from(([127, 0, 0, 1], 14000));
     tracing::debug!("listening  on {}", addr);
     axum::Server::bind(&addr)
         .serve(app.into_make_service())
diff --git a/src/lib.rs b/src/lib.rs
index bc746c7..fe79940 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -100,9 +100,7 @@ impl GlobalState {
         Self {
             proxies: Mutex::new(HashMap::new()),
             ports: RwLock::new(HashSet::new()),
-            verifying_key: verifying_key
-                .map(|key| VerifyingKey::from_str(key.as_ref()).ok())
-                .flatten(),
+            verifying_key: verifying_key.and_then(|key| VerifyingKey::from_str(key.as_ref()).ok()),
         }
     }
 }