diff --git a/cmd/pomerium-cli/tcp.go b/cmd/pomerium-cli/tcp.go index 9f4e9b59e..24612b480 100644 --- a/cmd/pomerium-cli/tcp.go +++ b/cmd/pomerium-cli/tcp.go @@ -11,9 +11,11 @@ import ( "os/signal" "strings" "syscall" + "time" "github.com/rs/zerolog" "github.com/spf13/cobra" + "golang.org/x/term" "github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/tcptunnel" @@ -69,6 +71,10 @@ var tcpCmd = &cobra.Command{ l := zerolog.New(zerolog.NewConsoleWriter(func(w *zerolog.ConsoleWriter) { w.Out = os.Stderr + w.TimeFormat = time.RFC3339 + if !term.IsTerminal(int(os.Stdin.Fd())) { + w.NoColor = !term.IsTerminal(int(os.Stdin.Fd())) + } })).With().Timestamp().Logger() log.SetLogger(&l) diff --git a/go.mod b/go.mod index c8f017d5e..72eb11a58 100644 --- a/go.mod +++ b/go.mod @@ -65,6 +65,7 @@ require ( golang.org/x/net v0.0.0-20210525063256-abc453219eb5 golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 google.golang.org/api v0.52.0 google.golang.org/genproto v0.0.0-20210722135532-667f2b7c528f google.golang.org/grpc v1.39.0 diff --git a/go.sum b/go.sum index 8535a93e5..39db5531b 100644 --- a/go.sum +++ b/go.sum @@ -1275,6 +1275,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=