8000 fix(minimald): return the served contract from the diag bundle handler by norrietaylor · Pull Request #918 · gominimal/minimal · GitHub
[go: up one dir, main page]
Skip to content

fix(minimald): return the served contract from the diag bundle handler #918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
norrietaylor merged 1 commit into from
Jul 22, 2026
Merged

fix(minimald): return the served contract from the diag bundle handler #918

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions crates/minimald/src/diag.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ use diagnostics::redact::{masked_process_env, redact_json};
use diagnostics::{BundleSink, BundleWriter, LOG_TAIL_CAP, Redaction};

use crate::ChannelConfig;
use crate::connection::ConnectionError;
use crate::server::ServerStateHandle;

/// Longest request body accepted before the read is abandoned. The body is a
Expand Down Expand Up @@ -124,11 +125,16 @@ pub(crate) async fn serve_stream_diag_bundle(
s: ServerStateHandle,
_config: ChannelConfig,
mut c: RuChannel<Msg>,
) {
if let Err(msg) = stream_diag_bundle(&s, &mut c).await {
let _ = c.extended_data_bytes(1, msg).await;
}
) -> Result<(), ConnectionError> {
let outcome = match stream_diag_bundle(&s, &mut c).await {
Ok(()) => Ok(()),
Err(msg) => {
let _ = c.extended_data_bytes(1, msg.clone()).await;
Err(ConnectionError::Internal(msg))
}
};
let _ = c.close().await;
outcome
}

/// Reads the request, then streams the bundle. On failure returns the
Expand Down
Loading
0