AcivityWriter

coadler · coadler · commit f6c36947ecd4 · 2020-06-12T18:17:15.000-05:00
diff --git a/cmd/coder/shell.go b/cmd/coder/shell.go
@@ -144,13 +144,16 @@ 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()()
 
-		activity.Copy(ap, stdin, os.Stdin)
+		wr := activity.Writer(ap, stdin)
+		io.Copy(wr, os.Stdin)
 	}()
 	go io.Copy(os.Stdout, process.Stdout())
 	go io.Copy(os.Stderr, process.Stderr())
 
 	return process.Wait()
 }
+
+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}
+}
