AcivityWriter

coadler · coadler · commit d259dccd45ac · 2020-06-15T16:38:30.000-05:00
diff --git a/cmd/coder/shell.go b/cmd/coder/shell.go
@@ -147,10 +147,11 @@ func runCommand(ctx context.Context, envName string, command string, args []stri
 		stdin := process.Stdin()
 		defer stdin.Close()
 
-		ap := &activity.Pusher{Source: "ssh", EnvID: env.ID, Client: entClient}
+		ap := &activity.Pusher{Source: sshActivityName, EnvID: env.ID, Client: entClient}
 		defer ap.Start()()
 
-		_, err := activity.Copy(ap, stdin, os.Stdin)
+		wr := activity.Writer(ap, stdin)
+		_, err := io.Copy(wr, os.Stdin)
 		if err != nil {
 			cancel()
 		}
@@ -173,3 +174,5 @@ func runCommand(ctx context.Context, envName string, command string, args []stri
 	}
 	return err
 }
+
+const sshActivityName = "ssh"
diff --git a/internal/activity/copy.go b/internal/activity/copy.go
diff --git a/internal/activity/writer.go b/internal/activity/writer.go
@@ -0,0 +1,17 @@
+package activity
+
+import "io"
+
+type activityWriter struct {
+	p  *Pusher
+	wr io.Writer
+}
+
+func (w *activityWriter) Write(p []byte) (n int, err error) {
+	w.p.Push()
+	return w.wr.Write(p)
+}
+
+func Writer(p *Pusher, wr io.Writer) io.Writer {
+	return &activityWriter{p: p, wr: wr}
+}

Original file line number	Diff line number	Diff line change
`@@ -147,10 +147,11 @@ func runCommand(ctx context.Context, envName string, command string, args []stri`
`147`	`147`	`stdin := process.Stdin()`
`148`	`148`	`defer stdin.Close()`
`149`	`149`
`150`		`- ap := &activity.Pusher{Source: "ssh", EnvID: env.ID, Client: entClient}`
	`150`	`+ ap := &activity.Pusher{Source: sshActivityName, EnvID: env.ID, Client: entClient}`
`151`	`151`	`defer ap.Start()()`
`152`	`152`
`153`		`- _, err := activity.Copy(ap, stdin, os.Stdin)`
	`153`	`+ wr := activity.Writer(ap, stdin)`
	`154`	`+ _, err := io.Copy(wr, os.Stdin)`
`154`	`155`	`if err != nil {`
`155`	`156`	`cancel()`
`156`	`157`	`}`
`@@ -173,3 +174,5 @@ func runCommand(ctx context.Context, envName string, command string, args []stri`
`173`	`174`	`}`
`174`	`175`	`return err`
`175`	`176`	`}`
	`177`	`+`
	`178`	`+const sshActivityName = "ssh"`