Method refactor now compiles

orchid-host/src/subprocess.rs

@@ -3,14 +3,12 @@ use std::{io, process};
 use futures::io::BufReader;
 use futures::{self, AsyncBufReadExt, StreamExt};
 use orchid_base::logging::log;
-#[cfg(feature = "tokio")]
 use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
 
 use crate::ctx::Ctx;
 use crate::extension::ExtPort;
 
-#[cfg(feature = "tokio")]
-pub async fn ext_command(cmd: std::process::Command, ctx: Ctx) -> io::Result<ExtPort> {
+pub async fn ext_command(cmd: process::Command, ctx: Ctx) -> io::Result<ExtPort> {
 	let name = cmd.get_program().to_string_lossy().to_string();
 	let mut child = tokio::process::Command::from(cmd)
 		.stdin(process::Stdio::piped())
@@ -25,9 +23,13 @@ pub async fn ext_command(cmd: std::process::Command, ctx: Ctx) -> io::Result<Ext
 		let _ = child;
 		let mut lines = BufReader::new(child_stderr.compat()).lines();
 		while let Some(line) = lines.next().await {
-			// route stderr with an empty category string. This is not the intended logging
-			// method
-			writeln!(log("stderr"), "{} err> {}", name, line.expect("Readline implies this")).await;
+			match line {
+				Ok(line) => writeln!(log("stderr"), "subproc {name} err> {line}").await,
+				Err(e) => match e.kind() {
+					io::ErrorKind::BrokenPipe | io::ErrorKind::UnexpectedEof => break,
+					_ => panic!("Error while reading stderr {e}"),
+				},
+			}
 		}
 	}));
 	Ok(ExtPort { input: Box::pin(stdin.compat_write()), output: Box::pin(stdout.compat()) })