remote: Add ssh timeout setting#44823
Merged
Veykril merged 4 commits intozed-industries:mainfrom Dec 15, 2025
Merged
Conversation
Signed-off-by: Marco Mihai Condrache <52580954+marcocondrache@users.noreply.github.com>
Signed-off-by: Marco Mihai Condrache <52580954+marcocondrache@users.noreply.github.com>
Veykril
reviewed
Dec 15, 2025
Comment on lines
+1263
to
+1265
| if let Some(timeout) = self.connection_timeout { | ||
| args.extend(["-o".to_string(), format!("ConnectTimeout={}", timeout)]); | ||
| } |
Member
There was a problem hiding this comment.
I am not sure we want this here, this will affect all the commands we run after
Contributor
Author
There was a problem hiding this comment.
@Veykril I’m a bit unsure what the best approach is here. From what I can tell, the only hardcoded timeout left is in the binary download step, and it applies to creating the connection rather than the download itself. That’s what led me to add it there, mainly for consistency.
I’m happy to adjust this though - curious what you think would be the cleanest way
Member
There was a problem hiding this comment.
Okay I double checked myself, I was wrong here. This is not used by what I thought, so this looks good, thanks!
CherryWorm
pushed a commit
to CherryWorm/zed
that referenced
this pull request
Dec 16, 2025
Closes zed-industries#21527 Release Notes: - Added a setting to specify the ssh connection timeout --------- Signed-off-by: Marco Mihai Condrache <52580954+marcocondrache@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #21527
Release Notes: