change: Print info/error output to stderr

CHANGELOG.md

@@ -76,6 +76,7 @@ Upon updating Pueue and restarting the daemon, the previous state will be wiped,
 - **Breaking**: Redesigned task editing process [#553](https://github.com/Nukesor/pueue/issues/553).
   Pueue now allows editing all properties a task in one editor session. There're two modes to do so: `toml` and `files`.
 - Revisited, fixed and cleaned up CLI help texts.
+- Print most of Pueue's info/log messages to `stderr`. Only keep useful stuff like json and task log output on `stdout`.
 
 ### Add
 

pueue/src/bin/pueued.rs

@@ -18,7 +18,7 @@
         // subcommand to install the service
         #[cfg(target_os = "windows")]
         if opt.service.is_some() {
-            println!("daemonize flag cannot be used with service subcommand");
+            eprintln!("daemonize flag cannot be used with service subcommand");
             return Ok(());
         }
 
@@ -120,7 +120,7 @@
     let current_exe = if let Ok(path) = std::env::current_exe() {
         path.to_string_lossy().clone().to_string()
     } else {
-        println!("Couldn't detect path of current binary. Falling back to 'pueue' in $PATH");
+        eprintln!("Couldn't detect path of current binary. Falling back to 'pueue' in $PATH");
         "pueued".to_string()
     };
 

pueue/src/client/client.rs

@@ -352,7 +352,7 @@
             .map(|t| format!("task{t}"))
             .collect::<Vec<String>>()
             .join(", ");
-        println!("You are trying to {action}: {task_ids}",);
+        eprintln!("You are trying to {action}: {task_ids}",);
 
         let mut input = String::new();
 
@@ -364,7 +364,7 @@
 
             match input.chars().next().unwrap() {
                 'N' | 'n' => {
-                    println!("Aborted!");
+                    eprintln!("Aborted!");
                     std::process::exit(1);
                 }
                 '\n' | 'Y' | 'y' => {

pueue/src/client/commands/restart.rs

@@ -165,7 +165,7 @@
         println!("Restarted tasks: {:?}", filtered_tasks.matching_ids);
     }
     if !filtered_tasks.non_matching_ids.is_empty() {
-        println!(
+        eprintln!(
             "Couldn't restart tasks: {:?}",
             filtered_tasks.non_matching_ids
         );

pueue/src/client/commands/wait.rs

@@ -58,7 +58,7 @@
         let tasks = get_tasks(&state, &selection);
 
         if tasks.is_empty() {
-            println!("No tasks found for selection {selection:?}");
+            eprintln!("No tasks found for selection {selection:?}");
             return Ok(());
         }
 

pueue/src/client/display/follow.rs

@@ -29,7 +29,7 @@
     // Ensure that it exists and is started.
     loop {
         let Some(task) = get_task(stream, task_id).await? else {
-            println!("Pueue: The task to be followed doesn't exist.");
+            eprintln!("Pueue: The task to be followed doesn't exist.");
             std::process::exit(1);
         };
         // Task started up, we can start to follow.
@@ -42,7 +42,7 @@
     let mut handle = match get_log_file_handle(task_id, pueue_directory) {
         Ok(stdout) => stdout,
         Err(err) => {
-            println!("Failed to get log file handles: {err}");
+            eprintln!("Failed to get log file handles: {err}");
             return Ok(());
         }
     };
@@ -58,7 +58,7 @@
     // The loop following this section will then only copy those last lines to stdout.
     if let Some(lines) = lines {
         if let Err(err) = seek_to_last_lines(&mut handle, lines) {
-            println!("Error seeking to last lines from log: {err}");
+            eprintln!("Error seeking to last lines from log: {err}");
         }
     }
 
@@ -73,17 +73,17 @@
     loop {
         // Check whether the file still exists. Exit if it doesn't.
         if !path.exists() {
-            println!("Pueue: Log file has gone away. Has the task been removed?");
+            eprintln!("Pueue: Log file has gone away. Has the task been removed?");
             return Ok(());
         }
         // Read the next chunk of text from the last position.
         if let Err(err) = io::copy(&mut handle, &mut stdout) {
-            println!("Pueue: Error while reading file: {err}");
+            eprintln!("Pueue: Error while reading file: {err}");
             return Ok(());
         };
         // Flush the stdout buffer to actually print the output.
         if let Err(err) = stdout.flush() {
-            println!("Pueue: Error while flushing stdout: {err}");
+            eprintln!("Pueue: Error while flushing stdout: {err}");
             return Ok(());
         };
 
@@ -94,7 +94,7 @@
         // In case either is not, exit.
         if (last_check % task_check_interval) == 0 {
             let Some(task) = get_task(stream, task_id).await? else {
-                println!("Pueue: The followed task has been removed.");
+                eprintln!("Pueue: The followed task has been removed.");
                 std::process::exit(1);
             };
             // Task exited by itself. We can stop following.

pueue/src/client/display/log/local.rs

@@ -19,7 +19,7 @@
     let mut file = match get_log_file_handle(task_id, &settings.shared.pueue_directory()) {
         Ok(file) => file,
         Err(err) => {
-            println!("Failed to get log file handle: {err}");
+            eprintln!("Failed to get log file handle: {err}");
             return;
         }
     };
@@ -47,7 +47,7 @@
                 match seek_to_last_lines(file, *lines) {
                     Ok(complete) => output_complete = complete,
                     Err(err) => {
-                        println!("Failed reading local log file: {err}");
+                        eprintln!("Failed reading local log file: {err}");
                         return;
                     }
                 }
@@ -61,11 +61,11 @@
             }
 
             // Print a newline between the task information and the first output.
-            println!("\n{header}{line_info}");
+            eprintln!("\n{header}{line_info}");
 
             // Print everything
             if let Err(err) = io::copy(file, stdout) {
-                println!("Failed reading local log file: {err}");
+                eprintln!("Failed reading local log file: {err}");
             };
         }
     }

pueue/src/client/display/log/mod.rs

@@ -74,15 +74,15 @@
     if task_logs.is_empty() {
         match selection {
             TaskSelection::TaskIds(_) => {
-                println!("There are no finished tasks for your specified ids");
+                eprintln!("There are no finished tasks for your specified ids");
                 return;
             }
             TaskSelection::Group(group) => {
-                println!("There are no finished tasks for group '{group}'");
+                eprintln!("There are no finished tasks for group '{group}'");
                 return;
             }
             TaskSelection::All => {
-                println!("There are no finished tasks");
+                eprintln!("There are no finished tasks");
                 return;
             }
         }
@@ -174,7 +174,7 @@
     if style.enabled {
         table.enforce_styling();
     }
-    println!("{table}");
+    eprintln!("{table}");
 
     // All other information is aligned and styled by using a separate table.
     let mut table = Table::new();
@@ -218,5 +218,5 @@
     first_column.set_cell_alignment(CellAlignment::Right);
     first_column.set_padding((0, 0));
 
-    println!("{table}");
+    eprintln!("{table}");
 }

pueue/src/client/display/log/remote.rs

@@ -26,7 +26,7 @@
             println!("\n{header}{line_info}");
 
             if let Err(err) = decompress_and_print_remote_log(bytes) {
-                println!("Error while parsing stdout: {err}");
+                eprintln!("Error while parsing stdout: {err}");
             }
         }
     }

pueue/src/client/display/mod.rs

@@ -27,5 +27,5 @@ pub fn print_success(_style: &OutputStyle, message: &str) {
 /// Used to style any generic failure message from the daemon.
 pub fn print_error(style: &OutputStyle, message: &str) {
     let styled = style.style_text(message, Some(Color::Red), None);
-    println!("{styled}");
+    eprintln!("{styled}");
 }

pueue/src/daemon/mod.rs

@@ -155,14 +155,14 @@
 
         // Cleanup the pid file
         if let Err(error) = pid::cleanup_pid_file(&settings_clone.shared.pid_path()) {
-            println!("Failed to cleanup pid after panic.");
-            println!("{error}");
+            eprintln!("Failed to cleanup pid after panic.");
+            eprintln!("{error}");
         }
 
         // Remove the unix socket.
         if let Err(error) = socket_cleanup(&settings_clone.shared) {
-            println!("Failed to cleanup socket after panic.");
-            println!("{error}");
+            eprintln!("Failed to cleanup socket after panic.");
+            eprintln!("{error}");
         }
 
         std::process::exit(1);

pueue/src/daemon/network/message_handler/log.rs

@@ -140,7 +140,7 @@
     // The loop following this section will then only copy those last lines to stdout.
     if let Some(lines) = message.lines {
         if let Err(err) = seek_to_last_lines(&mut handle, lines) {
-            println!("Error seeking to last lines from log: {err}");
+            eprintln!("Error seeking to last lines from log: {err}");
         }
     }
 

pueue/src/daemon/service.rs

@@ -191,8 +191,8 @@ pub fn start_service() -> Result<()> {
             service.start::<String>(&[])?;
             println!("Successfully started service");
         }
-        ServiceState::StartPending => println!("Service is already starting"),
-        ServiceState::Running => println!("Service is already running"),
+        ServiceState::StartPending => eprintln!("Service is already starting"),
+        ServiceState::Running => eprintln!("Service is already running"),
 
         _ => (),
     }
@@ -211,8 +211,8 @@ pub fn stop_service() -> Result<()> {
     let service = service_manager.open_service(SERVICE_NAME, service_access)?;
 
     match service.query_status()?.current_state {
-        ServiceState::Stopped => println!("Service is already stopped"),
-        ServiceState::StartPending => println!("Service cannot stop because it is starting (please wait until it fully started to stop it)"),
+        ServiceState::Stopped => eprintln!("Service is already stopped"),
+        ServiceState::StartPending => eprintln!("Service cannot stop because it is starting (please wait until it fully started to stop it)"),
         ServiceState::Running => {
             service.stop()?;
             println!("Successfully stopped service");

pueue/src/daemon/task_handler.rs

@@ -80,14 +80,14 @@
 
     // Remove the unix socket.
     if let Err(error) = socket_cleanup(&settings.shared) {
-        println!("Failed to cleanup socket during shutdown.");
-        println!("{error}");
+        eprintln!("Failed to cleanup socket during shutdown.");
+        eprintln!("{error}");
     }
 
     // Cleanup the pid file
     if let Err(error) = cleanup_pid_file(&settings.shared.pid_path()) {
-        println!("Failed to cleanup pid during shutdown.");
-        println!("{error}");
+        eprintln!("Failed to cleanup pid during shutdown.");
+        eprintln!("{error}");
     }
 
     // Actually exit the program the way we're supposed to.

pueue/tests/client/helper/compare_output.rs

@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::process::Output;
 
 use anyhow::{bail, Context, Result};
 use chrono::Local;
@@ -84,16 +85,19 @@ pub async fn get_task_context(settings: &Settings) -> Result<HashMap<String, Str
 /// and compares it with a given process's `stdout`.
 pub fn assert_template_matches(
     name: &str,
-    stdout: Vec<u8>,
+    output: Output,
     context: HashMap<String, String>,
 ) -> Result<()> {
+    let mut combined_output = output.stderr.clone();
+    combined_output.append(&mut output.stdout.clone());
+
     let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
         .join("tests")
         .join("client")
         .join("_templates")
         .join(name);
 
-    let actual = String::from_utf8(stdout).context("Got invalid utf8 as stdout!")?;
+    let actual = String::from_utf8(combined_output).context("Got invalid utf8 as output!")?;
 
     let Ok(mut expected) = read_to_string(&path) else {
         println!("Actual output:\n{actual}");
@@ -119,7 +123,7 @@ pub fn assert_template_matches(
 }
 
 /// Convenience wrapper to compare process stdout with snapshots.
-pub fn assert_snapshot_matches_stdout(name: &str, stdout: Vec<u8>) -> Result<()> {
+pub fn assert_snapshot_matches_output(name: &str, stdout: Vec<u8>) -> Result<()> {
     let actual = String::from_utf8(stdout).context("Got invalid utf8 as stdout!")?;
     assert_snapshot_matches(name, actual)
 }

pueue/tests/client/integration/follow.rs

@@ -35,7 +35,7 @@ async fn default(#[case] read_local_logs: bool) -> Result<()> {
     // This will result in the client receiving the streamed output until the task finished.
     let output = run_client_command(shared, &["follow"])?;
 
-    assert_snapshot_matches_stdout("follow__default", output.stdout)?;
+    assert_snapshot_matches_output("follow__default", output.stdout)?;
 
     Ok(())
 }
@@ -58,7 +58,7 @@ async fn last_lines(#[case] read_local_logs: bool) -> Result<()> {
     // Follow the task, but only print the last 4 lines of the output.
     let output = run_client_command(shared, &["follow", "--lines=4"])?;
 
-    assert_snapshot_matches_stdout("follow__last_lines", output.stdout)?;
+    assert_snapshot_matches_output("follow__last_lines", output.stdout)?;
 
     Ok(())
 }
@@ -79,7 +79,7 @@ async fn wait_for_task(#[case] read_local_logs: bool) -> Result<()> {
     // Wait for the task to start and follow until it finisheds.
     let output = run_client_command(shared, &["follow", "0"])?;
 
-    assert_snapshot_matches_stdout("follow__default", output.stdout)?;
+    assert_snapshot_matches_output("follow__default", output.stdout)?;
 
     Ok(())
 }
@@ -98,7 +98,7 @@ async fn fail_on_non_existing(#[case] read_local_logs: bool) -> Result<()> {
     // The client should exit with exit code `1`.
     let output = run_client_command(shared, &["follow", "0"])?;
     assert!(!output.status.success(), "follow got an unexpected exit 0");
-    assert_snapshot_matches_stdout("follow__fail_on_non_existing", output.stdout)?;
+    assert_snapshot_matches_output("follow__fail_on_non_existing", output.stderr)?;
 
     Ok(())
 }

pueue/tests/client/integration/group.rs

@@ -19,7 +19,7 @@ async fn default() -> Result<()> {
     // Get the group status output
     let output = run_client_command(shared, &["group"])?;
 
-    assert_snapshot_matches_stdout("group__default", output.stdout)?;
+    assert_snapshot_matches_output("group__default", output.stdout)?;
 
     Ok(())
 }
@@ -48,7 +48,7 @@ async fn colored() -> Result<()> {
     // Get the group status output
     let output = run_client_command(shared, &["--color", "always", "group"])?;
 
-    assert_snapshot_matches_stdout("group__colored", output.stdout)?;
+    assert_snapshot_matches_output("group__colored", output.stdout)?;
 
     Ok(())
 }

pueue/tests/client/integration/log.rs

@@ -34,7 +34,7 @@ async fn read(#[case] read_local_logs: bool) -> Result<()> {
     let output = run_client_command(shared, &["log"])?;
 
     let context = get_task_context(&daemon.settings).await?;
-    assert_template_matches("log__default", output.stdout, context)?;
+    assert_template_matches("log__default", output, context)?;
 
     Ok(())
 }
@@ -65,7 +65,7 @@ async fn read_truncated(#[case] read_local_logs: bool) -> Result<()> {
     let output = run_client_command(shared, &["log", "--lines=5"])?;
 
     let context = get_task_context(&daemon.settings).await?;
-    assert_template_matches("log__last_lines", output.stdout, context)?;
+    assert_template_matches("log__last_lines", output, context)?;
 
     Ok(())
 }
@@ -83,7 +83,7 @@ async fn task_with_label() -> Result<()> {
     let output = run_client_command(shared, &["log"])?;
 
     let context = get_task_context(&daemon.settings).await?;
-    assert_template_matches("log__with_label", output.stdout, context)?;
+    assert_template_matches("log__with_label", output, context)?;
 
     Ok(())
 }
@@ -101,7 +101,7 @@ async fn colored() -> Result<()> {
     let output = run_client_command(shared, &["--color", "always", "log"])?;
 
     let context = get_task_context(&daemon.settings).await?;
-    assert_template_matches("log__colored", output.stdout, context)?;
+    assert_template_matches("log__colored", output, context)?;
 
     Ok(())
 }