From 096aedc0d40d9ae3613e69006faad6726a047e31 Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Sat, 14 Aug 2021 13:32:09 +0200
Subject: [PATCH] Clean up some logging output

---
 crates/eww/src/app.rs    | 8 ++++----
 crates/eww/src/client.rs | 2 +-
 crates/eww/src/main.rs   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/eww/src/app.rs b/crates/eww/src/app.rs
index ee9b331..1518416 100644
--- a/crates/eww/src/app.rs
+++ b/crates/eww/src/app.rs
@@ -134,7 +134,7 @@ impl App {
                 }
                 DaemonCommand::OpenMany { windows, sender } => {
                     let result = windows.iter().try_for_each(|w| self.open_window(w, None, None, None, None));
-                    respond_with_error(sender, result)?;
+                    respond_with_result(sender, result)?;
                 }
                 DaemonCommand::OpenWindow { window_name, pos, size, anchor, screen: monitor, should_toggle, sender } => {
                     let result = if should_toggle && self.open_windows.contains_key(&window_name) {
@@ -142,11 +142,11 @@ impl App {
                     } else {
                         self.open_window(&window_name, pos, size, monitor, anchor)
                     };
-                    respond_with_error(sender, result)?;
+                    respond_with_result(sender, result)?;
                 }
                 DaemonCommand::CloseWindow { window_name, sender } => {
                     let result = self.close_window(&window_name);
-                    respond_with_error(sender, result)?;
+                    respond_with_result(sender, result)?;
                 }
                 DaemonCommand::PrintState { all, sender } => {
                     let vars = self.eww_state.get_variables().iter();
@@ -381,7 +381,7 @@ fn get_monitor_geometry(n: Option<i32>) -> Result<gdk::Rectangle> {
 }
 
 /// In case of an Err, send the error message to a sender.
-fn respond_with_error<T>(sender: DaemonResponseSender, result: Result<T>) -> Result<()> {
+fn respond_with_result<T>(sender: DaemonResponseSender, result: Result<T>) -> Result<()> {
     match result {
         Ok(_) => sender.send_success(String::new()),
         Err(e) => {
diff --git a/crates/eww/src/client.rs b/crates/eww/src/client.rs
index 60bee3d..e5d98ec 100644
--- a/crates/eww/src/client.rs
+++ b/crates/eww/src/client.rs
@@ -25,7 +25,7 @@ pub fn handle_client_only_action(paths: &EwwPaths, action: ActionClientOnly) ->
 }
 
 pub fn do_server_call(stream: &mut UnixStream, action: &opts::ActionWithServer) -> Result<Option<DaemonResponse>> {
-    log::info!("Forwarding options to server");
+    log::debug!("Forwarding options to server");
     stream.set_nonblocking(false).context("Failed to set stream to non-blocking")?;
 
     let message_bytes = bincode::serialize(&action)?;
diff --git a/crates/eww/src/main.rs b/crates/eww/src/main.rs
index edf377c..21d8eaf 100644
--- a/crates/eww/src/main.rs
+++ b/crates/eww/src/main.rs
@@ -129,9 +129,9 @@ fn listen_for_daemon_response(mut recv: DaemonResponseReceiver) {
 }
 
 fn handle_server_command(paths: &EwwPaths, action: &ActionWithServer, connect_attempts: usize) -> Result<()> {
-    log::info!("Trying to find server process at socket {}", paths.get_ipc_socket_file().display());
+    log::debug!("Trying to find server process at socket {}", paths.get_ipc_socket_file().display());
     let mut stream = attempt_connect(&paths.get_ipc_socket_file(), connect_attempts).context("Failed to connect to daemon")?;
-    log::info!("Connected to Eww server ({}).", &paths.get_ipc_socket_file().display());
+    log::debug!("Connected to Eww server ({}).", &paths.get_ipc_socket_file().display());
     let response = client::do_server_call(&mut stream, action).context("Error while forwarding command to server")?;
     if let Some(response) = response {
         println!("{}", response);