feat: add env vars to NNM (#5163)

* feat: add env vars to NNM * update version to testfran * add ip and port for locust connection as variables * bump version * bump version, fix env variable names * bump version to correct one
nymtech · Nov 22, 2024 · a720c95 · a720c95
1 parent 013941d
commit a720c95
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/nym-network-monitor/Cargo.toml b/nym-network-monitor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-network-monitor"
-version = "1.0.1"
+version = "1.0.2"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true
@@ -13,7 +13,7 @@ license.workspace = true
 [dependencies]
 anyhow = { workspace = true }
 axum = { workspace = true, features = ["json"] }
-clap = { workspace = true, features = ["derive"] }
+clap = { workspace = true, features = ["derive", "env"] }
 dashmap = { workspace = true }
 futures = { workspace = true }
 log = { workspace = true }

diff --git a/nym-network-monitor/entrypoint.sh b/nym-network-monitor/entrypoint.sh
@@ -15,7 +15,7 @@ nnm_pid=$!
 
 sleep 10
 
-python -m locust -H http://127.0.0.1:8080 --processes "${processes}" --autostart --autoquit 60 -u "${users}" -t "${timeout}"s &
+python -m locust -H http://${NYM_NETWORK_MONITOR_HOST}:${NYM_NETWORK_MONITOR_PORT} --processes "${processes}" --autostart --autoquit 60 -u "${users}" -t "${timeout}"s &
 locust_pid=$!
 
 wait $locust_pid

diff --git a/nym-network-monitor/src/main.rs b/nym-network-monitor/src/main.rs
@@ -107,11 +107,11 @@ struct Args {
     client_lifetime: u64,
 
     /// Port to listen on
-    #[arg(long, default_value_t = 8080)]
+    #[arg(long, default_value_t = 8080, env = "NYM_NETWORK_MONITOR_PORT")]
     port: u16,
 
     /// Host to listen on
-    #[arg(long, default_value = "127.0.0.1")]
+    #[arg(long, default_value = "127.0.0.1", env = "NYM_NETWORK_MONITOR_HOST")]
     host: String,
 
     /// Path to the topology file