Skip to content

Never drop blueprint data from the WS server's message buffer #8977

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

Merged
merged 1 commit into from
Feb 10, 2025
Merged

Never drop blueprint data from the WS server's message buffer #8977

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
15 changes: 7 additions & 8 deletions crates/store/re_ws_comms/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use parking_lot::Mutex;
use polling::{Event, Poller};
use tungstenite::WebSocket;

use re_log_types::LogMsg;
use re_log_types::{LogMsg, StoreKind};
use re_memory::MemoryLimit;
use re_smart_channel::ReceiveSet;

Expand Down Expand Up @@ -378,13 +378,12 @@ impl ReceiveSetBroadcaster {
}
});

let msg_is_data = matches!(data, LogMsg::ArrowMsg(_, _));
if msg_is_data {
inner.history.push(msg);
} else {
// Keep non-data commands around for clients late to the party.
inner.history.push_static(msg);
}
match data {
LogMsg::ArrowMsg(store_id, _) if store_id.kind != StoreKind::Blueprint => {
inner.history.push(msg);
}
_ => inner.history.push_static(msg),
};
}

re_smart_channel::SmartMessagePayload::Flush { on_flush_done } => {
Expand Down
Loading