Merge branch 'fix-output-channels'

Author: warpfork

cmd/repeatr/run/runCmd.go

@@ -102,7 +102,7 @@ func Run(stdout, stderr io.Writer) cli.ActionFunc {
 			return nil
 		}
 		// Else: Okay, human/terminal mode it is!
-		runRecord := terminal.Consume(runner, runID, stdout, stderr)
+		runRecord := terminal.Consume(runner, runID, stderr)
 
 		// Raise the error that got in the way of execution, if any.
 		cmdbhv.TryPlanToExit.MustHandle(runRecord.Failure)

cmd/repeatr/twerk/twerkCmd.go

@@ -98,7 +98,7 @@ func Twerk(stdin io.Reader, stdout, stderr io.Writer) cli.ActionFunc {
 		runID := runner.StartRun(&formula)
 
 		// Park our routine, following events and proxying them to terminal.
-		runRecord := terminal.Consume(runner, runID, stdout, stderr)
+		runRecord := terminal.Consume(runner, runID, stderr)
 
 		// Raise the error that got in the way of execution, if any.
 		cmdbhv.TryPlanToExit.MustHandle(runRecord.Failure)

core/actors/terminal/terminal.go

@@ -13,17 +13,17 @@ import (
 	"go.polydawn.net/repeatr/api/def"
 )
 
-func Consume(observationPost act.RunObserver, runID def.RunID, stdout, stderr io.Writer) *def.RunRecord {
+func Consume(observationPost act.RunObserver, runID def.RunID, stderr io.Writer) *def.RunRecord {
 	evtStream := make(chan *def.Event)
 	go observationPost.FollowEvents(runID, evtStream, 0)
 	for {
-		if rr := step(evtStream, stdout, stderr); rr != nil {
+		if rr := step(evtStream, stderr); rr != nil {
 			return rr
 		}
 	}
 }
 
-func step(evtStream chan *def.Event, stdout, stderr io.Writer) *def.RunRecord {
+func step(evtStream chan *def.Event, stderr io.Writer) *def.RunRecord {
 	select {
 	case evt := <-evtStream:
 		if evt.Log != nil {
@@ -38,7 +38,7 @@ func step(evtStream chan *def.Event, stdout, stderr io.Writer) *def.RunRecord {
 		}
 		if evt.Journal != "" {
 			// FIXME journal entries should just be byte slices
-			stdout.Write([]byte(evt.Journal))
+			stderr.Write([]byte(evt.Journal))
 			return nil
 		}
 		if evt.RunRecord != nil {