Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop logging EOFs and exit(1)s in ssh handler #20476

Merged
merged 10 commits into from
Jul 28, 2022
Merged

Stop logging EOFs and exit(1)s in ssh handler #20476

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9d6d005
Stop logging EOFs and exit(1)s in ssh handler
zeripath Jul 25, 2022
d53c278
Merge branch 'main' into fix-20473-stop-logging-eof
zeripath Jul 25, 2022
89fe4e8
Update modules/ssh/ssh.go
zeripath Jul 27, 2022
866cae5
Merge branch 'main' into fix-20473-stop-logging-eof
zeripath Jul 27, 2022
2b6b73c
placate lint
zeripath Jul 27, 2022
bb7fdc2
Merge remote-tracking branch 'origin/main' into fix-20473-stop-loggin…
zeripath Jul 27, 2022
76dbe26
Merge branch 'main' into fix-20473-stop-logging-eof
wxiaoguang Jul 28, 2022
a936d7d
Merge branch 'main' into fix-20473-stop-logging-eof
wxiaoguang Jul 28, 2022
b040733
Merge branch 'main' into fix-20473-stop-logging-eof
zeripath Jul 28, 2022
76b2f85
Merge branch 'main' into fix-20473-stop-logging-eof
zeripath Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions modules/ssh/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"crypto/rsa"
"crypto/x509"
"encoding/pem"
"errors"
"fmt"
"io"
"net"
Expand Down Expand Up @@ -142,10 +143,14 @@ func sessionHandler(session ssh.Session) {
// Wait for the command to exit and log any errors we get
err = cmd.Wait()
if err != nil {
log.Error("SSH: Wait: %v", err)
// Cannot use errors.Is here because ExitError doesn't implement Is
// Thus errors.Is will do equality test NOT type comparison
if _, ok := err.(*exec.ExitError); !ok {
zeripath marked this conversation as resolved.
Show resolved Hide resolved
log.Error("SSH: Wait: %v", err)
}
}

if err := session.Exit(getExitStatusFromError(err)); err != nil {
if err := session.Exit(getExitStatusFromError(err)); err != nil && !errors.Is(err, io.EOF) {
log.Error("Session failed to exit. %s", err)
}
}
Expand Down