From cc3da4a441968404dde88335fbee51e2affdfe5e Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Sat, 24 Aug 2019 08:19:44 -0400 Subject: [PATCH] logmon: revert workaround for Windows go1.11 bug Revert e0126123ab1ba848f72458538bc6118c978245e6 now that we are running with Golang 1.12, and https://github.com/golang/go/issues/29119 is no longer relevant. --- client/logmon/logmon.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/client/logmon/logmon.go b/client/logmon/logmon.go index 9030150af..bd03395e4 100644 --- a/client/logmon/logmon.go +++ b/client/logmon/logmon.go @@ -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) }