kill and reap ProxyCommand #5494
Merged
Conversation
This file contains 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
wez
requested changes
Jul 13, 2024
wezterm-ssh/Cargo.toml
Outdated
| @@ -39,6 +39,7 @@ wezterm-uds = { path = "../wezterm-uds" } | |||
|
|
|||
| # Not used directly, but is used to centralize the openssl vendor feature selection | |||
| async_ossl = { path = "../async_ossl" } | |||
| scopeguard = "1.2.0" | |||
There was a problem hiding this comment.
while scopeguard is handy in a pinch, I'm not in favor of it here for a couple of reasons:
- It is an additional external dependency
- You still have to remember to initiate the scope guard, and that is required in multiple places in this PR
What I'd prefer to see as a solution for this is for connect_to_host to return a little wrapper around the Child:
struct KillOnDropChild(Child);
impl std::ops::Deref for KillOnDropChild { ... }
impl std::ops::DerefMut for KillOnDropChild { ... }
impl Drop for KillOnDropChild {
fn drop(&mut self) {
self.0.kill();
self.0.wait();
}
}
|
Sounds reasonable, I'll update with the requested changes. |
|
Updated, I think this does the trick without use of |
The wrapper struct ensures ensures the child process spawned for the ProxyCommand is cleaned up under all the various error scenarios (such as auth failures etc), as well as in the normal successful use case. This includes killing it if necessary, and then waiting for it.
|
Thank you! |
wez
added a commit
that referenced
this pull request
Jul 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Using the scopeguard crate ensures the child process (if any) spawned for the ProxyCommand is cleaned up under all the various error scenarios (such as auth failures etc), as well as in the normal successful use case. This ensures killing it if necessary, and then waiting for it.
This is a fix for #5479.