From a7d2af2370ee186cdbf7f237a08754b9ed6991fd Mon Sep 17 00:00:00 2001
From: iximeow <git@iximeow.net>
Date: Thu, 29 Dec 2022 03:23:49 +0000
Subject: factor out io stuff

---
 src/ci_runner.rs | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

(limited to 'src/ci_runner.rs')

diff --git a/src/ci_runner.rs b/src/ci_runner.rs
index a88b135..3c0104f 100644
--- a/src/ci_runner.rs
+++ b/src/ci_runner.rs
@@ -14,6 +14,7 @@ use std::pin::Pin;
 use std::marker::Unpin;
 
 mod lua;
+mod io;
 
 #[derive(Debug)]
 enum WorkAcquireError {
@@ -75,21 +76,6 @@ pub struct RunningJob {
     client: RunnerClient,
 }
 
-async fn forward_data(mut source: impl AsyncRead + Unpin, mut dest: impl AsyncWrite + Unpin) -> Result<(), String> {
-    let mut buf = vec![0; 1024 * 1024];
-    loop {
-        let n_read = source.read(&mut buf).await
-            .map_err(|e| format!("failed to read: {:?}", e))?;
-
-        if n_read == 0 {
-            return Ok(());
-        }
-
-        dest.write_all(&buf[..n_read]).await
-            .map_err(|e| format!("failed to write: {:?}", e))?;
-    }
-}
-
 impl RunningJob {
     async fn send_metric(&mut self, name: &str, value: String) -> Result<(), String> {
         self.client.send(serde_json::json!({
@@ -182,11 +168,11 @@ impl RunningJob {
 
     async fn execute_command(&self, mut command: Command, name: &str, desc: &str) -> Result<ExitStatus, String> {
         eprintln!("[.] running {}", name);
-        let stdout_artifact = self.create_artifact(
+        let mut stdout_artifact = self.create_artifact(
             &format!("{} (stdout)", name),
             &format!("{} (stdout)", desc)
         ).await.expect("works");
-        let stderr_artifact = self.create_artifact(
+        let mut stderr_artifact = self.create_artifact(
             &format!("{} (stderr)", name),
             &format!("{} (stderr)", desc)
         ).await.expect("works");
@@ -198,13 +184,13 @@ impl RunningJob {
             .spawn()
             .map_err(|e| format!("failed to spawn '{}', {:?}", name, e))?;
 
-        let child_stdout = child.stdout.take().unwrap();
-        let child_stderr = child.stderr.take().unwrap();
+        let mut child_stdout = child.stdout.take().unwrap();
+        let mut child_stderr = child.stderr.take().unwrap();
 
         eprintln!("[.] '{}': forwarding stdout", name);
-        tokio::spawn(forward_data(child_stdout, stdout_artifact));
+        tokio::spawn(async move { crate::io::forward_data(&mut child_stdout, &mut stdout_artifact).await });
         eprintln!("[.] '{}': forwarding stderr", name);
-        tokio::spawn(forward_data(child_stderr, stderr_artifact));
+        tokio::spawn(async move { crate::io::forward_data(&mut child_stderr, &mut stderr_artifact).await });
 
         let res = child.wait().await
             .map_err(|e| format!("failed to wait? {:?}", e))?;
-- 
cgit v1.1