From 0bbf1fbb6078cacb1e3a75f5ea67a14d0398910c Mon Sep 17 00:00:00 2001
From: Tom Dyas <tdyas@toolchain.com>
Date: Mon, 19 Sep 2022 22:25:10 -0400
Subject: [PATCH] add "nailgun" to some nailgun error messages (#16914)

Add "nailgun" to some error messages generated by the Nailgun command runner, so that it is easier to diagnose where those error messages come from.
---
 src/rust/engine/process_execution/src/nailgun/mod.rs      | 4 ++--
 .../engine/process_execution/src/nailgun/nailgun_pool.rs  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/rust/engine/process_execution/src/nailgun/mod.rs b/src/rust/engine/process_execution/src/nailgun/mod.rs
index 4ba14072447..9d50864b495 100644
--- a/src/rust/engine/process_execution/src/nailgun/mod.rs
+++ b/src/rust/engine/process_execution/src/nailgun/mod.rs
@@ -255,7 +255,7 @@ impl CapturedWorkdir for CommandRunner {
             stdin_read
           })
         })
-        .map_err(|e| format!("Error communicating with server: {}", e))
+        .map_err(|e| format!("Error communicating with nailgun server: {}", e))
         .await?
     };
 
@@ -270,7 +270,7 @@ impl CapturedWorkdir for CommandRunner {
     let exit_code = child
       .wait()
       .map_ok(ChildOutput::Exit)
-      .map_err(|e| format!("Error communicating with server: {}", e));
+      .map_err(|e| format!("Error communicating with nailgun server: {}", e));
 
     Ok(futures::stream::select(output_stream, exit_code.into_stream()).boxed())
   }
diff --git a/src/rust/engine/process_execution/src/nailgun/nailgun_pool.rs b/src/rust/engine/process_execution/src/nailgun/nailgun_pool.rs
index 520e918ca81..963959315d6 100644
--- a/src/rust/engine/process_execution/src/nailgun/nailgun_pool.rs
+++ b/src/rust/engine/process_execution/src/nailgun/nailgun_pool.rs
@@ -220,7 +220,7 @@ impl NailgunPool {
     let status = process
       .handle
       .try_wait()
-      .map_err(|e| format!("Error getting the process status! {}", e))?;
+      .map_err(|e| format!("Error getting the process status from nailgun: {}", e))?;
     match status {
       None => {
         // Process hasn't exited yet.
@@ -297,7 +297,7 @@ fn spawn_and_read_port(
     .spawn()
     .map_err(|e| {
       format!(
-        "Failed to create child handle with cmd: {} options {:#?}: {}",
+        "Failed to create child handle for nailgun with cmd: {} options {:#?}: {}",
         &cmd, &process, e
       )
     })?;
@@ -314,7 +314,7 @@ fn spawn_and_read_port(
         .next()
         .ok_or_else(|| "There is no line ready in the child's output".to_string())
     })
-    .and_then(|res| res.map_err(|e| format!("Failed to read from stdout: {}", e)));
+    .and_then(|res| res.map_err(|e| format!("Failed to read stdout from nailgun: {}", e)));
 
   // If we failed to read a port line and the child has exited, report that.
   if port_line.is_err() {
@@ -340,7 +340,7 @@ fn spawn_and_read_port(
     .ok_or_else(|| format!("Output for nailgun server was unexpected:\n{:?}", port_line))?[1];
   let port = port_str
     .parse::<Port>()
-    .map_err(|e| format!("Error parsing port {}! {}", port_str, e))?;
+    .map_err(|e| format!("Error parsing nailgun port {}: {}", port_str, e))?;
 
   Ok((child, port))
 }