From e889c2628ad77dcb7083df16db6c01cf373dbab5 Mon Sep 17 00:00:00 2001
From: Sergio Benitez <sb@sergio.bz>
Date: Tue, 20 Aug 2024 23:31:24 -0700
Subject: [PATCH 1/2] Improve ignite fairing failure trace message.

---
 core/lib/src/error.rs           | 2 +-
 core/lib/src/trace/traceable.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/lib/src/error.rs b/core/lib/src/error.rs
index f08e94ad..60bbdd87 100644
--- a/core/lib/src/error.rs
+++ b/core/lib/src/error.rs
@@ -195,7 +195,7 @@ impl Error {
         match result {
             Ok(_) => process::ExitCode::SUCCESS,
             Err(e) => {
-                span_error!("error", "aborting launch due to error" => e.trace_error());
+                span_error!("launch failure", "aborting launch due to error" => e.trace_error());
                 process::ExitCode::SUCCESS
             }
         }
diff --git a/core/lib/src/trace/traceable.rs b/core/lib/src/trace/traceable.rs
index 19b8c8b5..fa3f6850 100644
--- a/core/lib/src/trace/traceable.rs
+++ b/core/lib/src/trace/traceable.rs
@@ -338,7 +338,7 @@ impl Trace for ErrorKind {
                 });
             }
             FailedFairings(fairings) => {
-                let span = span!(level, "fairings", count = fairings.len(), "ignition failure");
+                let span = span!(level, "failed ignite fairings", count = fairings.len());
                 span.in_scope(|| fairings.iter().trace_all(level));
             },
             SentinelAborts(sentries) => {

From dbeba45b363bb47dc00ba9696f1522d4b4945091 Mon Sep 17 00:00:00 2001
From: Sergio Benitez <sb@sergio.bz>
Date: Wed, 21 Aug 2024 02:21:26 -0700
Subject: [PATCH 2/2] Fix testbench ignite test: match new log output.

---
 testbench/src/servers/ignite_failure.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbench/src/servers/ignite_failure.rs b/testbench/src/servers/ignite_failure.rs
index 6a3da0cd..cafa5fc2 100644
--- a/testbench/src/servers/ignite_failure.rs
+++ b/testbench/src/servers/ignite_failure.rs
@@ -7,7 +7,7 @@ fn test_ignite_failure() -> Result<()> {
     };
 
     if let Err(Error::Liftoff(stdout, _)) = server {
-        assert!(stdout.contains("ignition failure"));
+        assert!(stdout.contains("failed ignite"));
         assert!(stdout.contains("FailNow"));
     } else {
         panic!("unexpected result: {server:#?}");