improve logical error logging (#47987)

fastly · May 13, 2024 · 9f925f6 · 9f925f6
1 parent 1f4013e
commit 9f925f6
Showing 1 changed file with 28 additions and 32 deletions.
diff --git a/src/connection.rs b/src/connection.rs
@@ -361,6 +361,20 @@ enum Error {
 }
 
 impl Error {
+    // returns true if the error represents a logic error (a bug in the code)
+    // that could warrant a panic or high severity log level
+    fn is_logical(&self) -> bool {
+        matches!(self, Error::ValueActive)
+    }
+
+    fn log_level(&self) -> Level {
+        if self.is_logical() {
+            Level::Error
+        } else {
+            Level::Debug
+        }
+    }
+
     fn to_condition(&self) -> &'static str {
         match self {
             Error::Io(e) if e.kind() == io::ErrorKind::ConnectionRefused => {
@@ -2371,14 +2385,7 @@ pub async fn server_req_connection<P: CidProvider, S: AsyncRead + AsyncWrite + I
     .await
     {
         Ok(()) => debug!("server-conn {}: finished", cid),
-        Err(e) => {
-            let level = match e {
-                Error::ValueActive => Level::Error,
-                _ => Level::Debug,
-            };
-
-            log!(level, "server-conn {}: process error: {:?}", cid, e);
-        }
+        Err(e) => log!(e.log_level(), "server-conn {}: process error: {:?}", cid, e),
     }
 }
 
@@ -4452,14 +4459,7 @@ pub async fn server_stream_connection<P: CidProvider, S: AsyncRead + AsyncWrite
     .await
     {
         Ok(()) => debug!("server-conn {}: finished", cid),
-        Err(e) => {
-            let level = match e {
-                Error::ValueActive => Level::Error,
-                _ => Level::Debug,
-            };
-
-            log!(level, "server-conn {}: process error: {:?}", cid, e);
-        }
+        Err(e) => log!(e.log_level(), "server-conn {}: process error: {:?}", cid, e),
     }
 }
 
@@ -5194,14 +5194,12 @@ pub async fn client_req_connection(
     .await
     {
         Ok(()) => debug!("client-conn {}: finished", log_id),
-        Err(e) => {
-            let level = match e {
-                Error::ValueActive => Level::Error,
-                _ => Level::Debug,
-            };
-
-            log!(level, "client-conn {}: process error: {:?}", log_id, e);
-        }
+        Err(e) => log!(
+            e.log_level(),
+            "client-conn {}: process error: {:?}",
+            log_id,
+            e
+        ),
     }
 }
 
@@ -6185,14 +6183,12 @@ pub async fn client_stream_connection<E>(
     .await
     {
         Ok(()) => debug!("client-conn {}: finished", log_id),
-        Err(e) => {
-            let level = match e {
-                Error::ValueActive => Level::Error,
-                _ => Level::Debug,
-            };
-
-            log!(level, "client-conn {}: process error: {:?}", log_id, e);
-        }
+        Err(e) => log!(
+            e.log_level(),
+            "client-conn {}: process error: {:?}",
+            log_id,
+            e
+        ),
     }
 }