a3f86ad34d
This change reduces many log levels to debug, particularly where errors are likely to be triggered by undocumented Discord messages or by threads exiting in an unpredictable way. This also reduces the task entry/exit messages to `trace`. This PR has been tested via `cargo make ready`, and by manually inspecting logs at `debug` and `info` levels running `examples/serenity/voice`.
96 lines
2.6 KiB
Rust
96 lines
2.6 KiB
Rust
use super::message::*;
|
|
use crate::constants::*;
|
|
use discortp::discord::MutableKeepalivePacket;
|
|
use flume::Receiver;
|
|
use std::sync::Arc;
|
|
#[cfg(not(feature = "tokio-02-marker"))]
|
|
use tokio::{
|
|
net::UdpSocket,
|
|
time::{timeout_at, Instant},
|
|
};
|
|
#[cfg(feature = "tokio-02-marker")]
|
|
use tokio_compat::{
|
|
net::udp::SendHalf,
|
|
time::{timeout_at, Instant},
|
|
};
|
|
use tracing::{error, instrument, trace};
|
|
|
|
struct UdpTx {
|
|
ssrc: u32,
|
|
rx: Receiver<UdpTxMessage>,
|
|
|
|
#[cfg(not(feature = "tokio-02-marker"))]
|
|
udp_tx: Arc<UdpSocket>,
|
|
#[cfg(feature = "tokio-02-marker")]
|
|
udp_tx: SendHalf,
|
|
}
|
|
|
|
impl UdpTx {
|
|
async fn run(&mut self) {
|
|
let mut keepalive_bytes = [0u8; MutableKeepalivePacket::minimum_packet_size()];
|
|
let mut ka = MutableKeepalivePacket::new(&mut keepalive_bytes[..])
|
|
.expect("FATAL: Insufficient bytes given to keepalive packet.");
|
|
ka.set_ssrc(self.ssrc);
|
|
|
|
let mut ka_time = Instant::now() + UDP_KEEPALIVE_GAP;
|
|
|
|
loop {
|
|
use UdpTxMessage::*;
|
|
match timeout_at(ka_time, self.rx.recv_async()).await {
|
|
Err(_) => {
|
|
trace!("Sending UDP Keepalive.");
|
|
if let Err(e) = self.udp_tx.send(&keepalive_bytes[..]).await {
|
|
error!("Fatal UDP keepalive send error: {:?}.", e);
|
|
break;
|
|
}
|
|
ka_time += UDP_KEEPALIVE_GAP;
|
|
},
|
|
Ok(Ok(Packet(p))) =>
|
|
if let Err(e) = self.udp_tx.send(&p[..]).await {
|
|
error!("Fatal UDP packet send error: {:?}.", e);
|
|
break;
|
|
},
|
|
Ok(Err(e)) => {
|
|
error!("Fatal UDP packet receive error: {:?}.", e);
|
|
break;
|
|
},
|
|
Ok(Ok(Poison)) => {
|
|
break;
|
|
},
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(not(feature = "tokio-02-marker"))]
|
|
#[instrument(skip(udp_msg_rx))]
|
|
pub(crate) async fn runner(udp_msg_rx: Receiver<UdpTxMessage>, ssrc: u32, udp_tx: Arc<UdpSocket>) {
|
|
trace!("UDP transmit handle started.");
|
|
|
|
let mut txer = UdpTx {
|
|
ssrc,
|
|
rx: udp_msg_rx,
|
|
udp_tx,
|
|
};
|
|
|
|
txer.run().await;
|
|
|
|
trace!("UDP transmit handle stopped.");
|
|
}
|
|
|
|
#[cfg(feature = "tokio-02-marker")]
|
|
#[instrument(skip(udp_msg_rx))]
|
|
pub(crate) async fn runner(udp_msg_rx: Receiver<UdpTxMessage>, ssrc: u32, udp_tx: SendHalf) {
|
|
trace!("UDP transmit handle started.");
|
|
|
|
let mut txer = UdpTx {
|
|
ssrc,
|
|
rx: udp_msg_rx,
|
|
udp_tx,
|
|
};
|
|
|
|
txer.run().await;
|
|
|
|
trace!("UDP transmit handle stopped.");
|
|
}
|