Merge pull request #1696 from travisturner/test-verbose-stderr

prevent closing os.Stderr (used in verbose test logging)
This commit is contained in:
Travis Turner 2018-10-17 18:06:09 -05:00 committed by GitHub
commit ddd0b7648a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -364,7 +364,10 @@ func (m *Command) Close() error {
eg.Go(m.gossipMemberSet.Close)
}
if closer, ok := m.logOutput.(io.Closer); ok {
eg.Go(closer.Close)
// If closer is os.Stdout or os.Stderr, don't close it.
if closer != os.Stdout && closer != os.Stderr {
eg.Go(closer.Close)
}
}
err := eg.Wait()
return errors.Wrap(err, "closing everything")