Miroirs/rkvm
1
0
Fork 0
mirror of https://github.com/htrefil/rkvm.git synced 2024-11-16 07:47:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve client switch log message

Browse source
This commit is contained in:
Jan Trefil 2023-10-11 09:21:10 +02:00
parent 2a1b48ac31
commit 99d5e39ab1
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
rkvm-server/src/server.rs
View file

@ -44,7 +44,7 @@ pub async fn run(
let mut monitor = Monitor::new();
let mut devices = Slab::<Device>::new();
let mut clients = Slab::new();
let mut clients = Slab::<(Sender<_>, SocketAddr)>::new();
let mut current = 0;
let mut previous = 0;
let mut changed = false;
@ -62,7 +62,7 @@ pub async fn run(
let password = password.to_owned();
// Remove dead clients.
clients.retain(|_, client: &mut Sender<_>| !client.is_closed());
clients.retain(|_, (client, _)| !client.is_closed());
if !clients.contains(current) {
current = 0;
}
@ -82,7 +82,7 @@ pub async fn run(
.collect();
let (sender, receiver) = mpsc::channel(1);
clients.insert(sender);
clients.insert((sender, addr));
let span = tracing::info_span!("connection", addr = %addr);
tokio::spawn(
@ -109,7 +109,7 @@ pub async fn run(
let abs = interceptor.abs().collect::<HashMap<_,_>>();
let keys = interceptor.key().collect::<HashSet<_>>();
for (_, sender) in &clients {
for (_, (sender, _)) in &clients {
let update = Update::CreateDevice {
id,
name: name.clone(),
@ -207,7 +207,11 @@ pub async fn run(
previous = idx;
changed = true;
tracing::debug!("Switched to client {}", current);
if current != 0 {
tracing::info!(idx = %current, addr = %clients[current - 1].1, "Switched client");
} else {
tracing::info!(idx = %current, "Switched client");
}
} else if changed {
idx = previous;
@ -238,7 +242,7 @@ pub async fn run(
}
for event in events {
if clients[idx - 1].send(Update::Event { id, event }).await.is_err() {
if clients[idx - 1].0.send(Update::Event { id, event }).await.is_err() {
clients.remove(idx - 1);
if current == idx {
@ -248,7 +252,7 @@ pub async fn run(
}
}
Err(err) if err.kind() == ErrorKind::BrokenPipe => {
for (_, sender) in &clients {
for (_, (sender, _)) in &clients {
let _ = sender.send(Update::DestroyDevice { id }).await;
}
devices.remove(id);