Skip to content

split tty to additional FH and callback to log.Printf #34

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

Open
joshcoughlan wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

split tty to additional FH and callback to log.Printf #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 24 additions & 0 deletions remote/remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ type config struct {
wpPath string
}

type lineWriter struct {
callback func(line string)
}

var remoteConfig config
var wpCliEventSender eventSender

Expand Down Expand Up @@ -699,10 +703,29 @@ func attachWpCliCmdRemote(conn net.Conn, wpcli *wpCLIProcess, GUID string, rows
return nil
}

func (lw *lineWriter) Write(p []byte) (n int, err error) {
lines := strings.Split(string(p), "\n")
for _, line := range lines {
if line != "" {
lw.callback(line)
}
}
return len(p), nil
}

func runWpCliCmdRemote(conn net.Conn, GUID string, rows uint16, cols uint16, wpCliCmdString string) error {
var cmdStdErr bytes.Buffer

cmdArgs := make([]string, 0)
cmdArgs = append(cmdArgs, strings.Fields("--path="+remoteConfig.wpPath)...)

// Create a custom writer that logs stderr lines
stderrLogger := &lineWriter{
callback: func(line string) {
log.Printf("runWpCliCmdRemote: stderr: %s", line)
},
}

cleanArgs, err := getCleanWpCliArgumentArray(wpCliCmdString)
if nil != err {
conn.Write([]byte("WP CLI command is invalid"))
Expand All @@ -715,6 +738,7 @@ func runWpCliCmdRemote(conn net.Conn, GUID string, rows uint16, cols uint16, wpC

cmd := exec.Command(remoteConfig.wpCLIPath, cmdArgs...)
cmd.Env = append(os.Environ(), "TERM=xterm-256color", "LESSSECURE=1")
cmd.Stderr = io.MultiWriter(&cmdStdErr, stderrLogger)

log.Printf("launching %s - rows: %d, cols: %d, args: %s\n", GUID, rows, cols, strings.Join(cmdArgs, " "))

Expand Down