Skip to content

fix: check if control channel is closed before sending drop messages #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daydoing wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: check if control channel is closed before sending drop messages #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ed0e47
Check if control channel is closed before sending drop messages
ethelbell Jun 2, 2025
517a9e8
Remove unused PnlTickId type and fields from PnlTicksResponseObject
ethelbell Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions v4-client-rs/client/src/indexer/rest/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ pub struct ErrorMsg {
pub location: String,
}

/// Profit and loss tick id.
#[derive(Deserialize, Debug, Clone, From, Display, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct PnlTickId(pub String);

/// PnL tick resolution.
#[derive(
Deserialize, Serialize, Debug, Clone, Copy, From, Display, PartialEq, Eq, PartialOrd, Ord, Hash,
Expand Down Expand Up @@ -250,10 +246,6 @@ pub struct HistoricalPnlResponse {
#[derive(Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct PnlTicksResponseObject {
/// Report id.
pub id: PnlTickId,
/// Subaccount id.
pub subaccount_id: SubaccountId,
/// Block height.
pub block_height: Height,
/// Time (UTC).
Expand Down
6 changes: 4 additions & 2 deletions v4-client-rs/client/src/indexer/sock/feed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@ where

impl<T: TryFrom<FeedMessage>> Drop for Feed<T> {
fn drop(&mut self) {
if let Err(err) = self.ctrl.send(ControlMsg::Unsubscribe(self.sub.clone())) {
log::error!("Sending of Unsubscribe control message to connector failed: {err}");
if !self.ctrl.is_closed() {
if let Err(err) = self.ctrl.send(ControlMsg::Unsubscribe(self.sub.clone())) {
log::error!("Sending of Unsubscribe control message to connector failed: {err}");
}
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions v4-client-rs/client/src/indexer/sock/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,10 @@ impl SockClient {

impl Drop for SockClient {
fn drop(&mut self) {
if let Err(e) = self.conn_tx.send(ControlMsg::Terminate) {
log::error!("Failed sending control Terminate to WebSocket connector: {e}");
if !self.conn_tx.is_closed() {
if let Err(e) = self.conn_tx.send(ControlMsg::Terminate) {
log::error!("Failed sending control Terminate to WebSocket connector: {e}");
}
}
}
}
Expand Down