Palav/dosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 58 Wiki Activity

Trace terminal loop failures
ci / test (push) Canceled after 0s
Details
ci / fuzz-smoke (push) Canceled after 0s
Details
ci / macos-client (macos-aarch64, macos-14) (push) Canceled after 0s
Details
ci / macos-client (macos-x86_64, macos-13) (push) Canceled after 0s
Details
ci / windows-client (push) Canceled after 0s
Details
ci / package-release (linux-x86_64, ubuntu-latest, , , ) (push) Canceled after 0s
Details
ci / package-release (macos-aarch64, macos-14, , , ) (push) Canceled after 0s
Details
ci / package-release (macos-x86_64, macos-13, , , ) (push) Canceled after 0s
Details
ci / package-release (windows-aarch64, windows-latest, aarch64, windows, aarch64-pc-windows-msvc) (push) Canceled after 0s
Details
ci / package-release (windows-x86_64, windows-latest, , , ) (push) Canceled after 0s
Details
ci / remote-bench (push) Canceled after 0s
Details
ci / publish-gitea-release (push) Canceled after 0s
Details

Browse Source
This commit is contained in:
DuProcess
2026-07-17 19:55:16 -04:00
parent 7a9ad38657
commit 86a1942aa0
1 changed files with 78 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/dosh-client.rs
+22 -7
View File
@@ -486,7 +486,8 @@ async fn main() -> Result<()> {
detach_once(&socket, &cred, 2).await?; detach_once(&socket, &cred, 2).await?;
return Ok(()); return Ok(());
} }
return run_terminal( return trace_terminal_result(
run_terminal(
socket, socket,
cred, cred,
Some(target_udp_addr), Some(target_udp_addr),
@@ -501,7 +502,8 @@ async fn main() -> Result<()> {
false, false,
None, None,
) )
.await; .await,
);
} }
Err(err) => { Err(err) => {
log_debug( log_debug(
@@ -525,7 +527,8 @@ async fn main() -> Result<()> {
detach_once(&socket, &cred, 2).await?; detach_once(&socket, &cred, 2).await?;
return Ok(()); return Ok(());
} }
return run_terminal( return trace_terminal_result(
run_terminal(
socket, socket,
cred, cred,
Some(target_udp_addr), Some(target_udp_addr),
@@ -540,7 +543,8 @@ async fn main() -> Result<()> {
false, false,
None, None,
) )
.await; .await,
);
} }
Err(err) => { Err(err) => {
log_debug( log_debug(
@@ -601,7 +605,8 @@ async fn main() -> Result<()> {
detach_once(&socket, &cred, 2).await?; detach_once(&socket, &cred, 2).await?;
return Ok(()); return Ok(());
} }
return run_terminal( return trace_terminal_result(
run_terminal(
socket, socket,
cred, cred,
Some(addr), Some(addr),
@@ -616,7 +621,8 @@ async fn main() -> Result<()> {
args.forward_only, args.forward_only,
agent_sock, agent_sock,
) )
.await; .await,
);
} }
Err(err) if !forwarding_requested && auth_allows(&auth_preference, "ssh") => { Err(err) if !forwarding_requested && auth_allows(&auth_preference, "ssh") => {
log_debug( log_debug(
@@ -680,6 +686,7 @@ async fn main() -> Result<()> {
detach_once(&socket, &cred, 2).await?; detach_once(&socket, &cred, 2).await?;
return Ok(()); return Ok(());
} }
trace_terminal_result(
run_terminal( run_terminal(
socket, socket,
cred, cred,
@@ -695,7 +702,8 @@ async fn main() -> Result<()> {
false, false,
None, None,
) )
.await .await,
)
} }
fn run_trust_command(config: &dosh::config::ClientConfig, args: &Args) -> Result<()> { fn run_trust_command(config: &dosh::config::ClientConfig, args: &Args) -> Result<()> {
@@ -6495,6 +6503,13 @@ fn terminal_input_channel() -> (mpsc::Sender<Vec<u8>>, mpsc::Receiver<Vec<u8>>)
mpsc::channel(STDIN_QUEUE_CAPACITY) mpsc::channel(STDIN_QUEUE_CAPACITY)
} }
fn trace_terminal_result(result: Result<()>) -> Result<()> {
if let Err(err) = &result {
dosh::trace::event("client.terminal_error", &[("error", format!("{err:#}"))]);
}
result
}
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
async fn run_terminal( async fn run_terminal(
socket: UdpSocket, socket: UdpSocket,