Commit6b0a0d3

committed

AcivityWriter

1 parent174c866 commit6b0a0d3Copy full SHA for 6b0a0d3

File tree

+15

-31

lines changed

+15

-31

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: 10 additions & 29 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,35 +2,16 @@ package activity`
`2`	`2`
`3`	`3`	`import"io"`
`4`	`4`
`5`		`-// Copy copyes src to dst, pushing activity when bytes are read from src.`
`6`		`-funcCopy(p*Pusher,dst io.Writer,src io.Reader) (writtenint64,errerror) {`
`7`		`-buf:=make([]byte,32*1024)`
`8`		`-`
`9`		`-for {`
`10`		`-nr,er:=src.Read(buf)`
`11`		`-ifnr>0 {`
`12`		`-p.Push()`
	`5`	`+typeactivityWriterstruct {`
	`6`	`+p*Pusher`
	`7`	`+wr io.Writer`
	`8`	`+}`
`13`	`9`
`14`		`-nw,ew:=dst.Write(buf[0:nr])`
`15`		`-ifnw>0 {`
`16`		`-written+=int64(nw)`
`17`		`-}`
`18`		`-ifew!=nil {`
`19`		`-err=ew`
`20`		`-break`
`21`		`-}`
`22`		`-ifnr!=nw {`
`23`		`-err=io.ErrShortWrite`
`24`		`-break`
`25`		`-}`
`26`		`-}`
`27`		`-ifer!=nil {`
`28`		`-ifer!=io.EOF {`
`29`		`-err=er`
`30`		`-}`
`31`		`-break`
`32`		`-}`
`33`		`-}`
	`10`	`+func (w*activityWriter)Write(p []byte) (nint,errerror) {`
	`11`	`+w.p.Push()`
	`12`	`+returnw.wr.Write(p)`
	`13`	`+}`
`34`	`14`
`35`		`-returnwritten,err`
	`15`	`+funcWriter(p*Pusher,wr io.Writer) io.Writer {`
	`16`	`+return&activityWriter{p:p,wr:wr}`
`36`	`17`	`}`

Comments

(0)