Archives/distant
2
0
Fork 0
mirror of https://github.com/chipsenkbeil/distant.git synced 2024-11-05 12:00:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix timeout default

Browse Source
This commit is contained in:
Chip Senkbeil 2023-03-31 00:51:43 -05:00
parent 40bd20e4ac
commit 2ab41c4976
No known key found for this signature in database
GPG Key ID: 35EF1F8EC72A4131
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cli/commands/client.rs
View File

@ -274,7 +274,10 @@ impl ClientSubcommand {
format!("Failed to open channel to connection {connection_id}")
})?;
let timeout = action_config.timeout.or(config.action.timeout);
let timeout = match action_config.timeout.or(config.action.timeout) {
Some(timeout) if timeout >= f32::EPSILON => Some(timeout),
_ => None,
};
debug!(
"Timeout configured to be {}",
@ -378,9 +381,7 @@ impl ClientSubcommand {
.into_channel()
.send_timeout(
DistantMsg::Single(request),
timeout
.or(config.action.timeout)
.map(Duration::from_secs_f32),
timeout.map(Duration::from_secs_f32),
)
.await
.context("Failed to send request")?;
@ -618,7 +619,10 @@ impl ClientSubcommand {
let connection_id =
use_or_lookup_connection_id(&mut cache, connection, &mut client).await?;
let timeout = repl_config.timeout.or(config.repl.timeout);
let timeout = match repl_config.timeout.or(config.repl.timeout) {
Some(timeout) if timeout >= f32::EPSILON => Some(timeout),
_ => None,
};
debug!("Opening raw channel to connection {}", connection_id);
let mut channel =