IntenseWebs/LibreQoS
3
0 Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2026-10-25 14:20:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Chore: remove useless conversions in lqosd

Browse Source
This commit is contained in:
Herbert Wolverson committed 2026-03-12 14:43:20 -05:00
1 parent d1aaa6c4aa
commit ef84a5f5b3
3 files changed
+24 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/rust/lqosd/src/lts2_sys/control_channel.rs
+22 -26
View File
@@ -318,7 +318,7 @@ async fn persistent_connection(
error!("Failed to serialize LicenseGrantRequest");
return;
};
if let Err(e) = socket_sender_tx.try_send(Message::Binary(bytes.into())) {
if let Err(e) = socket_sender_tx.try_send(Message::Binary(bytes)) {
match e {
TrySendError::Full(_) => {
warn!(
@@ -354,7 +354,7 @@ async fn persistent_connection(
error!("Failed to serialize BeginIngest message");
break 'message_pump;
};
if let Err(e) = socket_sender_tx.try_send(Message::Binary(bytes.into())) {
if let Err(e) = socket_sender_tx.try_send(Message::Binary(bytes)) {
match e {
TrySendError::Full(_) => {
warn!("Send unavailable: BeginIngest queue full; dropping message");
@@ -372,7 +372,7 @@ async fn persistent_connection(
error!("Failed to serialize IngestChunk message");
break 'message_pump;
};
if let Err(e) = socket_sender_tx.try_send(Message::Binary(bytes.into())) {
if let Err(e) = socket_sender_tx.try_send(Message::Binary(bytes)) {
match e {
TrySendError::Full(_) => {
warn!("Send unavailable: IngestChunk queue full; dropping chunk");
@@ -390,7 +390,7 @@ async fn persistent_connection(
error!("Failed to serialize EndIngest message");
break 'message_pump;
};
if let Err(e) = socket_sender_tx.try_send(Message::Binary(bytes.into())) {
if let Err(e) = socket_sender_tx.try_send(Message::Binary(bytes)) {
match e {
TrySendError::Full(_) => {
warn!("Send unavailable: EndIngest queue full; dropping message");
@@ -434,7 +434,7 @@ async fn persistent_connection(
}
continue 'message_pump;
};
if let Err(e) = socket_sender_tx.try_send(Message::Binary(bytes.into())) {
if let Err(e) = socket_sender_tx.try_send(Message::Binary(bytes)) {
match e {
TrySendError::Full(_) => {
warn!("Send unavailable: history query queue full; dropping request");
@@ -486,7 +486,7 @@ async fn persistent_connection(
continue 'message_pump;
};
if let Err(e) =
socket_sender_tx.try_send(Message::Binary(bytes.into()))
socket_sender_tx.try_send(Message::Binary(bytes))
{
match e {
TrySendError::Full(_) => {
@@ -546,7 +546,7 @@ async fn persistent_connection(
continue 'message_pump;
};
if let Err(e) =
socket_sender_tx.try_send(Message::Binary(bytes.into()))
socket_sender_tx.try_send(Message::Binary(bytes))
{
match e {
TrySendError::Full(_) => {
@@ -615,7 +615,7 @@ async fn persistent_connection(
continue 'message_pump;
};
if let Err(e) =
socket_sender_tx.try_send(Message::Binary(bytes.into()))
socket_sender_tx.try_send(Message::Binary(bytes))
{
match e {
TrySendError::Full(_) => {
@@ -684,7 +684,7 @@ async fn persistent_connection(
continue 'message_pump;
};
if let Err(e) =
socket_sender_tx.try_send(Message::Binary(bytes.into()))
socket_sender_tx.try_send(Message::Binary(bytes))
{
match e {
TrySendError::Full(_) => {
@@ -715,7 +715,7 @@ async fn persistent_connection(
break 'message_pump;
};
if permitted {
let _ = socket_sender_tx.try_send(Message::Binary(bytes.clone().into()));
let _ = socket_sender_tx.try_send(Message::Binary(bytes.clone()));
} else {
debug!("Queuing ChatbotStart until connection permitted (request_id={})", request_id);
if pending_chatbot_messages.len() >= MAX_PENDING_CHATBOT_MESSAGES {
@@ -729,7 +729,7 @@ async fn persistent_connection(
let message = messages::WsMessage::ChatbotUserInput { request_id, text };
if let Ok((_, _, bytes)) = message.to_bytes() {
if permitted {
let _ = socket_sender_tx.try_send(Message::Binary(bytes.clone().into()));
let _ = socket_sender_tx.try_send(Message::Binary(bytes.clone()));
} else {
debug!("Queuing ChatbotUserInput until connection permitted (request_id={})", request_id);
if pending_chatbot_messages.len() >= MAX_PENDING_CHATBOT_MESSAGES {
@@ -745,7 +745,7 @@ async fn persistent_connection(
let message = messages::WsMessage::ChatbotStop { request_id };
if let Ok((_, _, bytes)) = message.to_bytes() {
if permitted {
let _ = socket_sender_tx.try_send(Message::Binary(bytes.clone().into()));
let _ = socket_sender_tx.try_send(Message::Binary(bytes.clone()));
} else {
debug!("Queuing ChatbotStop until connection permitted (request_id={})", request_id);
if pending_chatbot_messages.len() >= MAX_PENDING_CHATBOT_MESSAGES {
@@ -795,7 +795,7 @@ async fn persistent_connection(
);
for bytes in pending_chatbot_messages.drain(..) {
if let Err(e) = socket_sender_tx
.try_send(Message::Binary(bytes.into()))
.try_send(Message::Binary(bytes))
{
match e {
TrySendError::Full(_) => warn!(
@@ -848,7 +848,7 @@ async fn persistent_connection(
error!("Failed to serialize heartbeat reply");
break 'message_pump;
};
if let Err(e) = socket_sender_tx.try_send(Message::Binary(bytes.into())) {
if let Err(e) = socket_sender_tx.try_send(Message::Binary(bytes)) {
match e {
TrySendError::Full(_) => {
warn!("Send unavailable: heartbeat reply queue full; dropping reply");
@@ -1037,7 +1037,7 @@ async fn persistent_connection(
// Send a WsMessage::Ping
debug!("Sending Ping message");
let bytes = vec![1u8; 4];
if let Err(e) = socket_sender_tx.try_send(Message::Ping(bytes.into())) {
if let Err(e) = socket_sender_tx.try_send(Message::Ping(bytes)) {
match e {
TrySendError::Full(_) => {
warn!("Send unavailable: ping queue full; dropping ping");
@@ -1069,7 +1069,7 @@ async fn persistent_connection(
error!("Failed to serialize license message");
break 'message_pump;
};
if let Err(e) = socket_sender_tx.try_send(Message::Binary(bytes.into())) {
if let Err(e) = socket_sender_tx.try_send(Message::Binary(bytes)) {
match e {
TrySendError::Full(_) => {
warn!("Send unavailable: license message queue full; dropping message");
@@ -1181,9 +1181,7 @@ async fn send_magic_number(
let (_raw_size, _compressed_size, bytes) = message.to_bytes()?;
timeout(
TCP_TIMEOUT,
socket.send(tokio_tungstenite::tungstenite::Message::Binary(
bytes.into(),
)),
socket.send(tokio_tungstenite::tungstenite::Message::Binary(bytes)),
)
.await??;
Ok(())
@@ -1210,9 +1208,7 @@ async fn send_license(
let (_, _, bytes) = message.to_bytes()?;
timeout(
TCP_TIMEOUT,
socket.send(tokio_tungstenite::tungstenite::Message::Binary(
bytes.into(),
)),
socket.send(tokio_tungstenite::tungstenite::Message::Binary(bytes)),
)
.await??;
@@ -1302,7 +1298,7 @@ async fn api_request(
return Ok(());
};
if let Err(e) = reply.try_send(Message::Binary(ws_bytes.into())) {
if let Err(e) = reply.try_send(Message::Binary(ws_bytes)) {
match e {
TrySendError::Full(_) => {
warn!("Send unavailable: ApiReply queue full; dropping reply");
@@ -1345,7 +1341,7 @@ async fn shaper_snapshot_streaming(
error!("Failed to serialize StreamingShaper message");
return Ok(());
};
if let Err(e) = reply.try_send(Message::Binary(ws_bytes.into())) {
if let Err(e) = reply.try_send(Message::Binary(ws_bytes)) {
match e {
TrySendError::Full(_) => {
warn!("Send unavailable: StreamingShaper queue full; dropping reply")
@@ -1617,7 +1613,7 @@ async fn circuit_snapshot_streaming(
error!("Failed to serialize StreamingCircuit message");
return Ok(());
};
if let Err(e) = reply.try_send(Message::Binary(ws_bytes.into())) {
if let Err(e) = reply.try_send(Message::Binary(ws_bytes)) {
match e {
TrySendError::Full(_) => {
warn!("Send unavailable: StreamingCircuit queue full; dropping reply")
@@ -1692,7 +1688,7 @@ async fn tree_snapshot_streaming(
error!("Failed to serialize StreamingShaperTree message");
return Ok(());
};
if let Err(e) = reply.try_send(Message::Binary(ws_bytes.into())) {
if let Err(e) = reply.try_send(Message::Binary(ws_bytes)) {
match e {
TrySendError::Full(_) => {
warn!("Send unavailable: StreamingShaperTree queue full; dropping reply")
src/rust/lqosd/src/node_manager/ws/single_user_channels/cake_watcher.rs
+1 -4
View File
@@ -1,5 +1,4 @@
use crate::node_manager::ws::messages::{WsResponse, encode_ws_message};
use lqos_bus::QueueStoreTransit;
use lqos_queue_tracker::{add_watched_queue, get_raw_circuit_data, still_watching};
pub(super) async fn cake_watcher(
@@ -17,9 +16,7 @@ pub(super) async fn cake_watcher(
match get_raw_circuit_data(&circuit_id) {
lqos_bus::BusResponse::RawQueueData(Some(msg)) => {
let response = WsResponse::CakeWatcher {
data: QueueStoreTransit::from(*msg),
};
let response = WsResponse::CakeWatcher { data: *msg };
if let Ok(payload) = encode_ws_message(&response) {
let send_result = tx.send(payload).await;
if send_result.is_err() {
src/rust/lqosd/src/node_manager/ws/single_user_channels/flows_by_circuit.rs
+1 -1
View File
@@ -85,7 +85,7 @@ pub(super) async fn flows_by_circuit(
let flows: Vec<(FlowbeeKeyTransit, FlowbeeLocalData, FlowAnalysis)> =
recent_flows_by_circuit(&circuit)
.into_iter()
.map(|(key, local, analysis)| (key.into(), local, analysis))
.map(|(key, local, analysis)| (key, local, analysis))
.collect();
if !flows.is_empty() {