explicitly reload config from ssh command #725
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
|
|
|
|
johnmaguire
reviewed
Jul 27, 2022
ssh.go
Outdated
| return w.WriteLine("HUP sent") | ||
| func sshReload(c *config.C, w sshd.StringWriter) error { | ||
| c.ReloadConfig() | ||
| return w.WriteLine("Config reloaded") |
There was a problem hiding this comment.
Per the PR description, IIUC this will never be seen because c.ReloadConfig() is a blocking call that restarts the SSH server.
Even if we change that line to go c.ReloadConfig() we'll be racing it. I agree then that this message should be sent prior to c.ReloadConfig(), e.g. "Reloading config"
nbrownus
approved these changes
Aug 8, 2022
|
@kazzmir Thanks for this! |
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.
The
reloadcommand sends SIGHUP to the process to let it reload the config, but SIGHUP is not implemented in windows. Rather than indirectly reloading via SIGHUP, this PR explicitly invokesc.ReloadConfig()when thereloadcommand is given in ssh.Previous behavior on windows:
The new behavior immediately closes the ssh connection once
reloadis given because the sshd server closes, so the user never sees a message, which is probably ok but the ssh handler forreloadcould write a message back to the client just before callingc.ReloadConfig()Resolves #694