Merge pull request #23706 from vespa-engine/arnej/go-logfmt-take-2

Arnej/go logfmt take 2

1 files changed, 11 insertions, 5 deletions

diff --git a/client/go/cmd/logfmt/runlogfmt.go b/client/go/cmd/logfmt/runlogfmt.go
index 9d782692f50..e3b3a0a3a78 100644
--- a/client/go/cmd/logfmt/runlogfmt.go
+++ b/client/go/cmd/logfmt/runlogfmt.go
@@ -8,12 +8,18 @@ import (
 	"bufio"
 	"fmt"
 	"os"
-
-	"github.com/mattn/go-isatty"
 )
 
-func inputIsTty() bool {
-	return isatty.IsTerminal(os.Stdin.Fd())
+func inputIsPipe() bool {
+	fi, err := os.Stdin.Stat()
+	if err != nil {
+		return false
+	}
+	if fi.Mode()&os.ModeNamedPipe == 0 {
+		return false
+	} else {
+		return true
+	}
 }
 
 func vespaHome() string {
@@ -28,7 +34,7 @@ func vespaHome() string {
 
 func RunLogfmt(opts *Options, args []string) {
 	if len(args) == 0 {
-		if inputIsTty() {
+		if !inputIsPipe() {
 			args = append(args, vespaHome()+"/logs/vespa/vespa.log")
 		} else {
 			formatFile(opts, os.Stdin)