Skip to content

Exit quietly when the reader closes stdout #16

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
openai0229 merged 1 commit into from
Sep 20, 2026
Merged

Exit quietly when the reader closes stdout #16

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
20 changes: 15 additions & 5 deletions crates/cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use serde_json::{json, Value};
use sqlx_protocol::{Action, Connection, Database};
use std::{
collections::BTreeMap,
io::{self, IsTerminal},
io::{self, IsTerminal, Write},
path::PathBuf,
};
use storage::{Datasource, Store};
Expand Down Expand Up @@ -236,9 +236,8 @@ fn main() {
Ok(true) => {}
Ok(false) => std::process::exit(1),
Err(e) => {
println!(
"{}",
json!({"success":false,"error":{"code":e.downcast_ref::<updates::UpdateError>().map(|e| e.code.as_str()).unwrap_or("sqlx.error"),"message":format!("{e:#}")}})
print_line(
&json!({"success":false,"error":{"code":e.downcast_ref::<updates::UpdateError>().map(|e| e.code.as_str()).unwrap_or("sqlx.error"),"message":format!("{e:#}")}}),
);
std::process::exit(1);
}
Expand Down Expand Up @@ -543,8 +542,19 @@ fn run(cli: Cli) -> Result<bool> {
}
Ok(true)
}
/// Write one JSON line. A consumer that stops reading (`sqlx … | head`) must not turn
/// into a panic; any other write failure still reports itself and fails.
fn print_line(value: &Value) {
if let Err(error) = writeln!(io::stdout(), "{value}") {
if error.kind() == io::ErrorKind::BrokenPipe {
std::process::exit(0);
}
eprintln!("sqlx could not write its result: {error}");
std::process::exit(1);
}
}
fn print(data: Value) {
println!("{}", json!({"success":true,"data":data}));
print_line(&json!({"success":true,"data":data}));
}
fn validate_name(name: &str) -> Result<()> {
if name.trim().is_empty() || uuid::Uuid::parse_str(name).is_ok() {
Expand Down
Loading