Client per request

nym-network-monitor/locustfile.py

@@ -6,7 +6,7 @@ class SendMsg(HttpUser):
     @task
     def hello_world(self):
         try:
-            response = self.client.post("/v1/send", timeout=10)
+            response = self.client.post("/v1/send")
             if response.status_code == 503:
                 time.sleep(1)
             response.raise_for_status()  # Raise an exception for bad status codes (4xx or 5xx)

nym-network-monitor/src/handlers.rs

@@ -15,13 +15,13 @@ use std::{
     sync::Arc,
     time::Duration,
 };
-use tokio::time::timeout;
+use tokio::{sync::RwLock, time::timeout};
 use utoipa::ToSchema;
 
 use crate::{
     accounting::{all_node_stats, NetworkAccount, NetworkAccountStats, NodeStats},
     http::AppState,
-    MIXNET_TIMEOUT,
+    make_client, MIXNET_TIMEOUT, TOPOLOGY,
 };
 
 #[derive(ToSchema, Serialize)]
@@ -183,7 +183,13 @@ pub async fn mermaid_handler() -> Result<String, StatusCode> {
     Ok(mermaid)
 }
 
-async fn send_receive_mixnet(state: AppState) -> Result<String, StatusCode> {
+async fn send_receive_mixnet(_state: AppState) -> Result<String, StatusCode> {
+    let client = Arc::new(RwLock::new(
+        make_client(TOPOLOGY.get().expect("Set at the begining").clone())
+            .await
+            .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?,
+    ));
+
     let msg: String = rand::thread_rng()
         .sample_iter(&Alphanumeric)
         .take(32)
@@ -191,15 +197,15 @@ async fn send_receive_mixnet(state: AppState) -> Result<String, StatusCode> {
         .collect();
     let sent_msg = msg.clone();
 
-    let client = {
-        let mut clients = state.clients().write().await;
-        if let Some(client) = clients.make_contiguous().choose(&mut rand::thread_rng()) {
-            Arc::clone(client)
-        } else {
-            error!("No clients currently available");
-            return Err(StatusCode::SERVICE_UNAVAILABLE);
-        }
-    };
+    // let client = {
+    //     let mut clients = state.clients().write().await;
+    //     if let Some(client) = clients.make_contiguous().choose(&mut rand::thread_rng()) {
+    //         Arc::clone(client)
+    //     } else {
+    //         error!("No clients currently available");
+    //         return Err(StatusCode::SERVICE_UNAVAILABLE);
+    //     }
+    // };
 
     let recv = Arc::clone(&client);
     let sender = Arc::clone(&client);

nym-network-monitor/src/main.rs

@@ -232,13 +232,13 @@ async fn main() -> Result<()> {
 
     MIXNET_TIMEOUT.set(args.mixnet_timeout).ok();
 
-    let spawn_clients = Arc::clone(&clients);
-    tokio::spawn(make_clients(
-        spawn_clients,
-        args.n_clients,
-        args.client_lifetime,
-        TOPOLOGY.get().expect("Topology not set yet!").clone(),
-    ));
+    // let spawn_clients = Arc::clone(&clients);
+    // tokio::spawn(make_clients(
+    //     spawn_clients,
+    //     args.n_clients,
+    //     args.client_lifetime,
+    //     TOPOLOGY.get().expect("Topology not set yet!").clone(),
+    // ));
 
     let clients_server = clients.clone();