logmon: revert workaround for Windows go1.11 bug

Revert e0126123ab now that we are running
with Golang 1.12, and https://github.com/golang/go/issues/29119 is no
longer relevant.
This commit is contained in:
Mahmood Ali
2019-08-24 08:19:44 -04:00
parent b4a80a7eea
commit cc3da4a441

View File

@@ -204,10 +204,7 @@ func newLogRotatorWrapper(path string, logger hclog.Logger, rotator io.WriteClos
var openFn func() (io.ReadCloser, error)
var err error
//FIXME Revert #5990 and check os.IsNotExist once Go >= 1.12 is the
// release compiler.
_, serr := os.Stat(path)
if serr != nil {
if _, ferr := os.Stat(path); os.IsNotExist(ferr) {
openFn, err = fifo.CreateAndRead(path)
} else {
openFn = func() (io.ReadCloser, error) {
@@ -216,7 +213,6 @@ func newLogRotatorWrapper(path string, logger hclog.Logger, rotator io.WriteClos
}
if err != nil {
logger.Error("Failed to create FIFO", "stat_error", serr, "create_err", err)
return nil, fmt.Errorf("failed to create fifo for extracting logs: %v", err)
}