From 566ef5ebc3f071c835c5b124a485809382c8edeb Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Tue, 15 Oct 2024 13:23:18 -0700
Subject: [PATCH] Display anyhow error chains better

The default Display / `{}` formatter only shows the outermost error. We
have to use `{:#}` to show all the errors in the chain. This will make
stream errors somewhat more informational.

Before:

    Stream error: Storage error: service error

After:

    Stream error e=Storage error: service error: NoSuchKey: The specified key does not exist.: NoSuchKey: The specified key does not exist.

(after I manually mucked with the DB to change the S3 url for an item to
a non-existent name)
---
 server/src/api/binary_cache.rs | 4 ++--
 server/src/error.rs            | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/src/api/binary_cache.rs b/server/src/api/binary_cache.rs
index 242f0f1..6795cff 100644
--- a/server/src/api/binary_cache.rs
+++ b/server/src/api/binary_cache.rs
@@ -218,7 +218,7 @@ async fn get_nar(
             Download::Url(url) => Ok(Redirect::temporary(&url).into_response()),
             Download::AsyncRead(stream) => {
                 let stream = ReaderStream::new(stream).map_err(|e| {
-                    tracing::error!("Stream error: {e}");
+                    tracing::error!(%e, "Stream error");
                     e
                 });
                 let body = Body::from_stream(stream);
@@ -255,7 +255,7 @@ async fn get_nar(
         // TODO: Make num_prefetch configurable
         // The ideal size depends on the average chunk size
         let merged = merge_chunks(chunks, streamer, storage, 2).map_err(|e| {
-            tracing::error!("Stream error: {e}");
+            tracing::error!(%e, "Stream error");
             e
         });
         let body = Body::from_stream(merged);
diff --git a/server/src/error.rs b/server/src/error.rs
index f5d5d41..ca7f4d6 100644
--- a/server/src/error.rs
+++ b/server/src/error.rs
@@ -57,10 +57,10 @@ pub enum ErrorKind {
     /// The requested NAR has missing chunks and needs to be repaired.
     IncompleteNar,
 
-    /// Database error: {0}
+    /// Database error: {0:#}
     DatabaseError(AnyError),
 
-    /// Storage error: {0}
+    /// Storage error: {0:#}
     StorageError(AnyError),
 
     /// Manifest serialization error: {0}
@@ -69,7 +69,7 @@ pub enum ErrorKind {
     /// Access error: {0}
     AccessError(super::access::Error),
 
-    /// General request error: {0}
+    /// General request error: {0:#}
     RequestError(AnyError),
 
     /// Error from the common components.