add err output when server failed to start

This commit is contained in:
Gwen Lg 2024-06-13 22:16:45 +02:00
parent 959eab61b0
commit a5cd13771b

View File

@ -1,7 +1,7 @@
use crate::server::utils::{get_free_port, wait_for_port}; use crate::server::utils::{get_free_port, wait_for_port};
use mktemp::Temp; use mktemp::Temp;
use std::error::Error; use std::error::Error;
use std::io::{Cursor, Read}; use std::io::{self, Cursor, Read};
use std::process::{Child, Stdio}; use std::process::{Child, Stdio};
use zip::ZipArchive; use zip::ZipArchive;
@ -53,7 +53,7 @@ impl EmbeddedServer {
.arg("-p") .arg("-p")
.arg(port.to_string()) .arg(port.to_string())
.stdout(Stdio::null()) .stdout(Stdio::null())
.stderr(Stdio::null()) .stderr(Stdio::piped())
.spawn()?; .spawn()?;
wait_for_port(&mut child, port)?; wait_for_port(&mut child, port)?;
@ -78,7 +78,8 @@ impl Drop for EmbeddedServer {
} }
mod utils { mod utils {
use std::io::ErrorKind; use std::fmt::Write;
use std::io::{BufRead, BufReader, ErrorKind};
use std::process::Child; use std::process::Child;
use std::time::Duration; use std::time::Duration;
@ -115,10 +116,24 @@ mod utils {
fn check_server(child: &mut Child) -> Result<(), std::io::Error> { fn check_server(child: &mut Child) -> Result<(), std::io::Error> {
match child.try_wait() { match child.try_wait() {
Ok(None) => Ok(()), // Continue Ok(None) => Ok(()), // Continue
Ok(Some(status)) => Err(std::io::Error::new( Ok(Some(status)) => {
ErrorKind::Other, let mut err_msg = format!("grammalecte-server exit with `{status}`");
format!("grammalecte-server exit with {status}"),
)), if let Some(err) = child.stderr.take() {
writeln!(&mut err_msg, " :").unwrap();
let err = BufReader::new(err);
err.lines().for_each(|line| match line {
Ok(line) => {
writeln!(&mut err_msg, "\t{}", line).unwrap();
}
Err(err) => {
writeln!(&mut err_msg, "__{err:?}").unwrap();
}
});
};
Err(std::io::Error::new(ErrorKind::Other, err_msg))
}
Err(err) => Err(std::io::Error::new( Err(err) => Err(std::io::Error::new(
ErrorKind::Other, ErrorKind::Other,
format!("Error append during check grammalecte-server status {err}"), format!("Error append during check grammalecte-server status {err}"),