-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #74 from skunkteam/live-logging-websocket-interface
live logging websocket interface
- Loading branch information
Showing
12 changed files
with
757 additions
and
289 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| use std::time::Duration; | ||
|
|
||
| use axum::{ | ||
| extract::{ | ||
| ws::{Message, WebSocket}, | ||
| State, WebSocketUpgrade, | ||
| }, | ||
| response::Response, | ||
| routing::get, | ||
| BoxError, Router, | ||
| }; | ||
| use emulator_tracing::{DynamicSubscriber, Tracing}; | ||
| use tracing::{debug, error, trace}; | ||
|
|
||
| pub(crate) fn router<S: Tracing>() -> Router<&'static S> { | ||
| Router::new().route("/", get(logging_route)) | ||
| } | ||
|
|
||
| async fn logging_route( | ||
| State(tracing): State<&'static impl Tracing>, | ||
| ws: WebSocketUpgrade, | ||
| ) -> Response { | ||
| ws.on_upgrade(move |mut socket| async move { | ||
| if let Err(err) = logging_handler(&mut socket, tracing).await { | ||
| error!(error = err, "error in logging socket"); | ||
| let _unused = socket.send(Message::Text(format!("ERROR: {err}"))).await; | ||
| }; | ||
| debug!("WebSockets connection closing"); | ||
| }) | ||
| } | ||
|
|
||
| async fn logging_handler( | ||
| socket: &mut WebSocket, | ||
| tracing: &'static impl Tracing, | ||
| ) -> Result<(), BoxError> { | ||
| debug!("WebSockets connection established, waiting for directives"); | ||
| let Some(cmd) = socket.recv().await else { | ||
| // Closed before receiving the first message | ||
| return Ok(()); | ||
| }; | ||
| let Message::Text(dirs) = cmd? else { | ||
| return Err("unexpected message".into()); | ||
| }; | ||
|
|
||
| debug!("Received directives: {dirs:?}"); | ||
| let subscription = tracing.subscribe(&dirs)?; | ||
|
|
||
| let mut interval = tokio::time::interval(Duration::from_millis(100)); | ||
| interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Delay); | ||
| loop { | ||
| tokio::select! { | ||
| _ = interval.tick() => { | ||
| let logs = subscription.consume(); | ||
| if !logs.is_empty() { | ||
| trace!("Flushing logs"); | ||
| socket.send(Message::Text(String::from_utf8_lossy(&logs).into_owned())).await?; | ||
| } | ||
| } | ||
| cmd = socket.recv() => { | ||
| let Some(cmd) = cmd else { | ||
| return Ok(()); | ||
| }; | ||
| let Message::Text(cmd) = cmd? else { | ||
| return Err("unexpected command".into()); | ||
| }; | ||
| if cmd != "STOP" { | ||
| return Err("unexpected command".into()); | ||
| } | ||
| debug!("Received STOP command, flushing logs"); | ||
| let logs = subscription.consume(); | ||
| if !logs.is_empty() { | ||
| debug!("Flushing logs"); | ||
| socket.send(Message::Text(String::from_utf8_lossy(&logs).into_owned())).await?; | ||
| } | ||
| return Ok(()); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.