Skip to content
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

Fix parent broker connection heartbeat interval #9

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Fix parent broker connection heartbeat interval #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions src/broker/peer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,15 +245,19 @@ async fn parent_broker_peer_loop(client_id: i32, config: ParentBrokerConfig, bro

let mut fut_receive_frame = frame_reader.receive_frame().fuse();
let mut fut_receive_broker_event = broker_to_peer_receiver.recv().fuse();
let make_timeout = || {
Box::pin(future::timeout(heartbeat_interval, future::pending::<()>())).fuse()
};
let mut fut_timeout = make_timeout();
loop {
let fut_timeout = future::timeout(heartbeat_interval, future::pending::<()>());
select! {
res_timeout = fut_timeout.fuse() => {
res_timeout = fut_timeout => {
assert!(res_timeout.is_err());
// send heartbeat
let msg = RpcMessage::new_request(".app", METH_PING, None);
debug!("sending ping");
frame_writer.send_message(msg).await?;
fut_timeout = make_timeout();
},
res_frame = fut_receive_frame => match res_frame {
Ok(mut frame) => {
Expand Down Expand Up @@ -319,6 +323,7 @@ async fn parent_broker_peer_loop(client_id: i32, config: ParentBrokerConfig, bro
}
debug!("Sending rpc frame");
frame_writer.send_frame(frame).await?;
fut_timeout = make_timeout();
}
BrokerToPeerMessage::SendMessage(rpcmsg) => {
// log!(target: "RpcMsg", Level::Debug, "<---- Send message, client id: {}", client_id);
Expand All @@ -330,6 +335,7 @@ async fn parent_broker_peer_loop(client_id: i32, config: ParentBrokerConfig, bro
}
debug!("Sending rpc message");
frame_writer.send_message(rpcmsg).await?;
fut_timeout = make_timeout();
},
}
fut_receive_broker_event = broker_to_peer_receiver.recv().fuse();
Expand Down
Loading