fix(rust): fix session life cycle (#646)
* fix(rust): fix session life cycle
Signed-off-by: SSpirits <admin@lv5.moe>
* fix(rust): fix session life cycle
Signed-off-by: SSpirits <admin@lv5.moe>
---------
Signed-off-by: SSpirits <admin@lv5.moe>
diff --git a/rust/src/client.rs b/rust/src/client.rs
index 69000be..91bd369 100644
--- a/rust/src/client.rs
+++ b/rust/src/client.rs
@@ -190,14 +190,14 @@
},
command = telemetry_command_rx.recv() => {
if let Some(command) = command {
- let result = Self::handle_telemetry_command(rpc_client.clone(), &transaction_checker, endpoints.clone(), command).await;
+ let result = Self::handle_telemetry_command(rpc_client.shadow_session(), &transaction_checker, endpoints.clone(), command).await;
if let Err(error) = result {
error!(logger, "handle telemetry command failed: {:?}", error);
}
}
},
_ = &mut shutdown_rx => {
- debug!(logger, "receive shutdown signal, stop heartbeat task and telemetry command handler");
+ info!(logger, "receive shutdown signal, stop heartbeat task and telemetry command handler");
break;
}
}
diff --git a/rust/src/session.rs b/rust/src/session.rs
index d54894d..c69e9ee 100644
--- a/rust/src/session.rs
+++ b/rust/src/session.rs
@@ -102,8 +102,8 @@
shutdown_tx: Option<oneshot::Sender<()>>,
}
-impl Clone for Session {
- fn clone(&self) -> Self {
+impl Session {
+ pub(crate) fn shadow_session(&self) -> Self {
Session {
logger: self.logger.clone(),
client_id: self.client_id.clone(),
@@ -580,7 +580,7 @@
let mut session_map = self.session_map.lock().await;
let endpoint_url = endpoints.endpoint_url().to_string();
return if session_map.contains_key(&endpoint_url) {
- Ok(session_map.get(&endpoint_url).unwrap().clone())
+ Ok(session_map.get(&endpoint_url).unwrap().shadow_session())
} else {
let mut session = Session::new(
&self.logger,
@@ -590,8 +590,9 @@
)
.await?;
session.start(settings, telemetry_command_tx).await?;
- session_map.insert(endpoint_url.clone(), session.clone());
- Ok(session)
+ let shadow_session = session.shadow_session();
+ session_map.insert(endpoint_url.clone(), session);
+ Ok(shadow_session)
};
}
@@ -599,7 +600,7 @@
let session_map = self.session_map.lock().await;
let mut sessions = Vec::new();
for (_, session) in session_map.iter() {
- sessions.push(session.clone());
+ sessions.push(session.shadow_session());
}
Ok(sessions)
}