remove redundant information from RPC error reason field

capnproto · Jan 15, 2025 · e9730c8 · e9730c8
1 parent 1ec4709
commit e9730c8
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/capnp-rpc/src/rpc.rs b/capnp-rpc/src/rpc.rs
@@ -356,7 +356,6 @@ fn to_pipeline_ops(
 }
 
 fn from_error(error: &Error, mut builder: exception::Builder) {
-    builder.set_reason(error.to_string());
     let typ = match error.kind {
         ::capnp::ErrorKind::Failed => exception::Type::Failed,
         ::capnp::ErrorKind::Overloaded => exception::Type::Overloaded,
@@ -368,6 +367,17 @@ fn from_error(error: &Error, mut builder: exception::Builder) {
         _ => exception::Type::Failed,
     };
     builder.set_type(typ);
+    match error.kind {
+        ::capnp::ErrorKind::Failed
+        | ::capnp::ErrorKind::Overloaded
+        | ::capnp::ErrorKind::Disconnected
+        | ::capnp::ErrorKind::Unimplemented => {
+            builder.set_reason(&error.extra);
+        }
+        _ => {
+            builder.set_reason(error.to_string());
+        }
+    }
 }
 
 fn remote_exception_to_error(exception: exception::Reader) -> Error {