milo: fix running steps

client/logdog/annotee/executor/executor.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package executor
 
 import (
         "errors"
         "fmt"
         "io"
@@ skipping 115 matching lines @@
                 stdout,
                 stderr,
         }
 
         // Process the bootstrapped I/O. We explicitly defer a Finish here to ensure
         // that we clean up any internal streams if our Processor fails/panics.
         //
         // If we fail to process the I/O, terminate the bootstrapped process
         // immediately, since it may otherwise block forever on I/O.
         proc := annotee.New(ctx, options)
-        defer proc.Finish()
+        defer proc.Finish(options.CloseSteps)
 
         if err := proc.RunStreams(streams); err != nil {
                 cancelFunc()
                 return fmt.Errorf("failed to process bootstrapped I/O: %v", err)
         }
 
         // Finish and record our annotation steps on completion.
-        proc.Finish().ForEachStep(func(s *annotation.Step) {
+        proc.Finish(options.CloseSteps).ForEachStep(func(s *annotation.Step) {
                 e.steps = append(e.steps, s.Proto())
         })
         return nil
 }
 
 // Steps returns a list of Steps from the latest run.
 func (e *Executor) Steps() []*milo.Step {
         return e.steps
 }
 
@@ skipping 18 matching lines @@
                 Name:             name,
                 Tee:              tee,
                 Alias:            "stdio",
                 StripAnnotations: (e.Annotate == StripAnnotations),
         }
         if e.Annotate != NoAnnotations {
                 s.Annotate = true
         }
         return s
 }