From f886ea043664eb16db14647d4bf319bf61d2d6b5 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Sun, 23 Jul 2023 08:19:32 +0400 Subject: [PATCH] studio: Update log levels to reduce spam --- src/modules/tas_studio/hltas_bridge.rs | 4 ++-- src/modules/tas_studio/remote.rs | 21 ++++++++++++--------- src/modules/tas_studio/watcher.rs | 4 ++-- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/modules/tas_studio/hltas_bridge.rs b/src/modules/tas_studio/hltas_bridge.rs index d19080fb..9beb5710 100644 --- a/src/modules/tas_studio/hltas_bridge.rs +++ b/src/modules/tas_studio/hltas_bridge.rs @@ -35,7 +35,7 @@ fn write_first_version(path: &Path, script: &HLTAS) -> eyre::Result<()> { stem.push("-backup.hltas"); let backup_name = path.with_file_name(stem); - debug!( + trace!( "{} already exists, renaming it to {}", path.to_string_lossy(), backup_name.to_string_lossy(), @@ -164,7 +164,7 @@ impl Bridge { return None; } - info!("reading updated bridged .hltas"); + trace!("reading updated bridged .hltas"); let _span = info_span!("bridge reading script").entered(); diff --git a/src/modules/tas_studio/remote.rs b/src/modules/tas_studio/remote.rs index b051fb2f..4e1421b6 100644 --- a/src/modules/tas_studio/remote.rs +++ b/src/modules/tas_studio/remote.rs @@ -125,7 +125,7 @@ fn server_thread(listener: TcpListener) { let mut state = STATE.lock().unwrap(); if let Some(State::Server(Some(_))) = *state { - info!("continuing because already have a client"); + trace!("continuing because already have a client"); continue; } @@ -139,7 +139,7 @@ fn server_thread(listener: TcpListener) { let (server, name) = IpcOneShotServer::new().unwrap(); - info!("Accepted remote client connection, replying with name: {name}"); + debug!("Accepted remote client connection, replying with name: {name}"); if let Err(err) = stream.write_all(name.as_bytes()) { error!("Error sending IPC server name to the remote client: {err:?}"); @@ -245,9 +245,10 @@ fn client_connection_thread() { let (receiver, sender) = match connect_to_server(stream) { Ok(x) => x, - Err(_err) => { - // The server will refuse connections if it doesn't need one. Don't spam the log. - // error!("error connecting to server: {err:?}"); + Err(err) => { + // The server will refuse connections if it doesn't need one. Use trace!() and no + // backtrace (no :?) to not spam the log. + trace!("error connecting to server: {err}"); continue; } }; @@ -259,7 +260,9 @@ fn client_connection_thread() { fn connect_to_server( mut stream: TcpStream, ) -> eyre::Result<(IpcReceiver, IpcSender)> { - debug!("reading IPC name from server"); + // The first messages are trace!() because they will spam every second if we're trying to + // connect to a server which already has a game connected. + trace!("reading IPC name from server"); let mut name = String::new(); stream @@ -267,7 +270,7 @@ fn connect_to_server( .context("error reading IPC name from server")?; drop(stream); - debug!("connecting to server IPC"); + trace!("connecting to server IPC"); let tx = IpcSender::connect(name).context("error connecting to the server IPC")?; let (hltas_sender, request_receiver) = @@ -280,11 +283,11 @@ fn connect_to_server( let (workaround_sender, workaround_receiver) = ipc_channel::ipc::channel().context("error creating workaround IPC channel")?; - debug!("sending senders to server"); + trace!("sending senders to server"); tx.send((hltas_sender, workaround_sender)) .context("error sending IPC channels to server")?; - debug!("receiving sender from server"); + trace!("receiving sender from server"); let response_sender = workaround_receiver .recv() .context("error receiving frames sender from server")?; diff --git a/src/modules/tas_studio/watcher.rs b/src/modules/tas_studio/watcher.rs index 1c84a589..410af67e 100644 --- a/src/modules/tas_studio/watcher.rs +++ b/src/modules/tas_studio/watcher.rs @@ -34,7 +34,7 @@ impl Watcher { thread::sleep(Duration::from_millis(500)); if should_stop.load(Ordering::SeqCst) { - debug!("Exiting watcher thread for {}", path.to_string_lossy()); + trace!("Exiting watcher thread for {}", path.to_string_lossy()); break; } @@ -42,7 +42,7 @@ impl Watcher { if last_mtime != Some(mtime) { has_changed.store(true, Ordering::SeqCst); last_mtime = Some(mtime); - debug!("file changed: {}", path.to_string_lossy()); + trace!("file changed: {}", path.to_string_lossy()); } } }