ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

utils: Don't panic in capture_stream

Browse source
This commit is contained in:
Zhaofeng Li 2021-12-05 01:14:12 -08:00
parent 8e5f168e5d
commit 0f8873027f
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/nix/host/key_uploader.rs
View file

@ -46,7 +46,8 @@ pub async fn feed_uploader(mut uploader: Child, key: &Key, job: Option<JobHandle
capture_stream(stderr, job.clone(), true), capture_stream(stderr, job.clone(), true),
uploader.wait(), uploader.wait(),
); );
let (_, _, exit) = futures.await; let (stdout, stderr, exit) = futures.await;
stdout?; stderr?;
let exit = exit?; let exit = exit?;

18
src/util.rs
View file

@ -58,9 +58,9 @@ impl CommandExecution {
child.wait(), child.wait(),
); );
let (stdout_str, stderr_str, wait) = futures.await; let (stdout, stderr, wait) = futures.await;
self.stdout = Some(stdout_str); self.stdout = Some(stdout?);
self.stderr = Some(stderr_str); self.stderr = Some(stderr?);
let exit = wait?; let exit = wait?;
@ -173,12 +173,14 @@ fn canonicalize_cli_path(path: &str) -> PathBuf {
} }
} }
pub async fn capture_stream<R: AsyncRead + Unpin>(mut stream: BufReader<R>, job: Option<JobHandle>, stderr: bool) -> String { pub async fn capture_stream<R>(mut stream: BufReader<R>, job: Option<JobHandle>, stderr: bool) -> NixResult<String>
where R: AsyncRead + Unpin
{
let mut log = String::new(); let mut log = String::new();
loop { loop {
let mut line = String::new(); let mut line = String::new();
let len = stream.read_line(&mut line).await.unwrap(); let len = stream.read_line(&mut line).await?;
if len == 0 { if len == 0 {
break; break;
@ -188,9 +190,9 @@ pub async fn capture_stream<R: AsyncRead + Unpin>(mut stream: BufReader<R>, job:
if let Some(job) = &job { if let Some(job) = &job {
if stderr { if stderr {
job.stderr(trimmed.to_string()).unwrap(); job.stderr(trimmed.to_string())?;
} else { } else {
job.stdout(trimmed.to_string()).unwrap(); job.stdout(trimmed.to_string())?;
} }
} }
@ -198,7 +200,7 @@ pub async fn capture_stream<R: AsyncRead + Unpin>(mut stream: BufReader<R>, job:
log += "\n"; log += "\n";
} }
log Ok(log)
} }
pub fn get_label_width(targets: &TargetNodeMap) -> Option<usize> { pub fn get_label_width(targets: &TargetNodeMap) -> Option<usize> {