Commitf6c3694

committed

AcivityWriter

1 parent174c866 commitf6c3694Copy full SHA for f6c3694

File tree

+22

-38

lines changed

+22

-38

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -144,13 +144,16 @@ func runCommand(ctx context.Context, envName string, command string, args []stri`
`144`	`144`	`stdin:=process.Stdin()`
`145`	`145`	`deferstdin.Close()`
`146`	`146`
`147`		`-ap:=&activity.Pusher{Source:"ssh",EnvID:env.ID,Client:entClient}`
	`147`	`+ap:=&activity.Pusher{Source:sshActivityName,EnvID:env.ID,Client:entClient}`
`148`	`148`	`deferap.Start()()`
`149`	`149`
`150`		`-activity.Copy(ap,stdin,os.Stdin)`
	`150`	`+wr:=activity.Writer(ap,stdin)`
	`151`	`+io.Copy(wr,os.Stdin)`
`151`	`152`	`}()`
`152`	`153`	`goio.Copy(os.Stdout,process.Stdout())`
`153`	`154`	`goio.Copy(os.Stderr,process.Stderr())`
`154`	`155`
`155`	`156`	`returnprocess.Wait()`
`156`	`157`	`}`
	`158`	`+`
	`159`	`+constsshActivityName="ssh"`

Lines changed: 0 additions & 36 deletions

This file was deleted.

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,17 @@`
	`1`	`+package activity`
	`2`	`+`
	`3`	`+import"io"`
	`4`	`+`
	`5`	`+typeactivityWriterstruct {`
	`6`	`+p*Pusher`
	`7`	`+wr io.Writer`
	`8`	`+}`
	`9`	`+`
	`10`	`+func (w*activityWriter)Write(p []byte) (nint,errerror) {`
	`11`	`+w.p.Push()`
	`12`	`+returnw.wr.Write(p)`
	`13`	`+}`
	`14`	`+`
	`15`	`+funcWriter(p*Pusher,wr io.Writer) io.Writer {`
	`16`	`+return&activityWriter{p:p,wr:wr}`
	`17`	`+}`

Comments

(0)