Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #820 for real this time

Browse Source
This commit is contained in:
Keagan McClelland
2021-11-29 13:20:04 -07:00
committed by Aiden McClelland
parent c3c161cc25
commit 848c5d4e6f
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
appmgr/src/db/mod.rs
View File

@@ -29,6 +29,7 @@ use crate::middleware::auth::{HasValidSession, HashSessionToken};
use crate::util::{display_serializable, GeneralGuard, IoFormat};
use crate::{Error, ResultExt};
#[instrument(skip(ctx, ws_fut))]
async fn ws_handler<
WSFut: Future<Output = Result<Result<WebSocketStream<Upgraded>, HyperError>, JoinError>>,
>(
@@ -116,6 +117,7 @@ async fn subscribe_to_session_kill(
recv
}
#[instrument(skip(_has_valid_authentication, kill, sub, stream))]
async fn deal_with_messages(
_has_valid_authentication: HasValidSession,
mut kill: oneshot::Receiver<()>,
@@ -143,13 +145,7 @@ async fn deal_with_messages(
.with_kind(crate::ErrorKind::Network)?;
}
message = stream.next().fuse() => {
let message = match message.transpose() {
Err(tokio_tungstenite::tungstenite::Error::ConnectionClosed) => {
tracing::info!("Closing WebSocket: Reason: {}", tokio_tungstenite::tungstenite::Error::ConnectionClosed);
return Ok(())
}
a => a,
}.with_kind(crate::ErrorKind::Network)?;
let message = message.transpose().with_kind(crate::ErrorKind::Network)?;
match message {
Some(Message::Ping(a)) => {
stream
@@ -163,10 +159,6 @@ async fn deal_with_messages(
} else {
tracing::info!("Closing WebSocket: Reason: Unknown");
}
stream
.send(Message::Close(frame))
.await
.with_kind(crate::ErrorKind::Network)?;
return Ok(())
}
_ => (),