mirror/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2026-07-10 23:35:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

machine: simplify ssh debug output logging

Browse Source 
When the command output is logged we do not need an extra pipe and
scanner to read the output line by line, we can just log it directly via
a writer.

Now this of course does loose the line by line parsing of the scanner
but IMO this is better as it is simpler and less code to worry about.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2026-06-29 13:20:45 +02:00
parent 278068ef18
commit 838fc24d3e
1 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/machine/ssh.go
View File

@@ -1,7 +1,6 @@
package machine
import (
"bufio"
"fmt"
"io"
"os"
@@ -61,6 +60,13 @@ func LocalhostSSHCopy(username, identityPath string, sshPort int, srcPath, destP
return cmd.Run()
}
type sshDebugLogger struct{}
func (w *sshDebugLogger) Write(p []byte) (int, error) {
logrus.Debugf("ssh output: %s", string(p))
return len(p), nil
}
func localhostBuiltinSSH(username, identityPath, name string, sshPort int, inputArgs []string, passOutput bool, stdin io.Reader) error {
config, err := createLocalhostConfig(username, identityPath) // WARNING: This MUST NOT be generalized to allow communication over untrusted networks.
if err != nil {
@@ -86,40 +92,14 @@ func localhostBuiltinSSH(username, identityPath, name string, sshPort int, input
session.Stdout = os.Stdout
session.Stderr = os.Stderr
} else if logrus.IsLevelEnabled(logrus.DebugLevel) {
return runSessionWithDebug(session, cmd)
logger := &sshDebugLogger{}
session.Stdout = logger
session.Stderr = logger
}
return session.Run(cmd)
}
func runSessionWithDebug(session *ssh.Session, cmd string) error {
outPipe, err := session.StdoutPipe()
if err != nil {
return err
}
errPipe, err := session.StderrPipe()
if err != nil {
return err
}
logOuput := func(pipe io.Reader, done chan struct{}) {
scanner := bufio.NewScanner(pipe)
for scanner.Scan() {
logrus.Debugf("ssh output: %s", scanner.Text())
}
done <- struct{}{}
}
if err := session.Start(cmd); err != nil {
return err
}
completed := make(chan struct{}, 2)
go logOuput(outPipe, completed)
go logOuput(errPipe, completed)
<-completed
<-completed
return session.Wait()
}
// createLocalhostConfig returns a *ssh.ClientConfig for authenticating a user using a private key
//
// WARNING: This MUST NOT be used to communicate over untrusted networks.