Fixes for log/output streams

mislav · mislav · commit b47686163a2d · 2021-08-17T13:04:55.000+02:00
diff --git a/cmd/ghcs/logs.go b/cmd/ghcs/logs.go
@@ -78,7 +78,7 @@ func Logs(tail bool, codespaceName string) error {
 	go func() {
 		scanner := bufio.NewScanner(stdout)
 		for scanner.Scan() {
-			log.Println(scanner.Text())
+			fmt.Println(scanner.Text())
 		}
 
 		if err := scanner.Err(); err != nil {
diff --git a/internal/codespaces/ssh.go b/internal/codespaces/ssh.go
@@ -56,12 +56,12 @@ func makeSSHArgs(port int, dst, cmd string) ([]string, []string) {
 	return cmdArgs, connArgs
 }
 
-func ConnectToTunnel(ctx context.Context, port int, destination string, usingCustomPort bool) <-chan error {
+func ConnectToTunnel(ctx context.Context, log logger, port int, destination string, usingCustomPort bool) <-chan error {
 	connClosed := make(chan error)
 	args, connArgs := makeSSHArgs(port, destination, "")
 
 	if usingCustomPort {
-		fmt.Println("Connection Details: ssh " + destination + " " + strings.Join(connArgs, " "))
+		log.Println("Connection Details: ssh " + destination + " " + strings.Join(connArgs, " "))
 	}
 
 	cmd := exec.CommandContext(ctx, "ssh", args...)

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func Logs(tail bool, codespaceName string) error {`
`78`	`78`	`go func() {`
`79`	`79`	`scanner := bufio.NewScanner(stdout)`
`80`	`80`	`for scanner.Scan() {`
`81`		`- log.Println(scanner.Text())`
	`81`	`+ fmt.Println(scanner.Text())`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`if err := scanner.Err(); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -56,12 +56,12 @@ func makeSSHArgs(port int, dst, cmd string) ([]string, []string) {`
`56`	`56`	`return cmdArgs, connArgs`
`57`	`57`	`}`
`58`	`58`
`59`		`-func ConnectToTunnel(ctx context.Context, port int, destination string, usingCustomPort bool) <-chan error {`
	`59`	`+func ConnectToTunnel(ctx context.Context, log logger, port int, destination string, usingCustomPort bool) <-chan error {`
`60`	`60`	`connClosed := make(chan error)`
`61`	`61`	`args, connArgs := makeSSHArgs(port, destination, "")`
`62`	`62`
`63`	`63`	`if usingCustomPort {`
`64`		`- fmt.Println("Connection Details: ssh " + destination + " " + strings.Join(connArgs, " "))`
	`64`	`+ log.Println("Connection Details: ssh " + destination + " " + strings.Join(connArgs, " "))`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`cmd := exec.CommandContext(ctx, "ssh", args...)`