diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/dcat/main.go | 5 | ||||
| -rw-r--r-- | cmd/dgrep/main.go | 5 | ||||
| -rw-r--r-- | cmd/dmap/main.go | 5 | ||||
| -rw-r--r-- | cmd/dserver/main.go | 8 | ||||
| -rw-r--r-- | cmd/dtail/main.go | 5 |
5 files changed, 15 insertions, 13 deletions
diff --git a/cmd/dcat/main.go b/cmd/dcat/main.go index 238f97a..1aa7798 100644 --- a/cmd/dcat/main.go +++ b/cmd/dcat/main.go @@ -6,7 +6,6 @@ import ( "os" "github.com/mimecast/dtail/internal/clients" - "github.com/mimecast/dtail/internal/color" "github.com/mimecast/dtail/internal/config" "github.com/mimecast/dtail/internal/io/logger" "github.com/mimecast/dtail/internal/io/signal" @@ -42,7 +41,9 @@ func main() { flag.Parse() config.Read(cfgFile, sshPort) - color.Colored = !noColor + if noColor { + config.Client.TermColorsEnabled = false + } if displayVersion { version.PrintAndExit() diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go index 4da1bb3..422bdd4 100644 --- a/cmd/dgrep/main.go +++ b/cmd/dgrep/main.go @@ -6,7 +6,6 @@ import ( "os" "github.com/mimecast/dtail/internal/clients" - "github.com/mimecast/dtail/internal/color" "github.com/mimecast/dtail/internal/config" "github.com/mimecast/dtail/internal/io/logger" "github.com/mimecast/dtail/internal/io/signal" @@ -46,7 +45,9 @@ func main() { flag.Parse() config.Read(cfgFile, sshPort) - color.Colored = !noColor + if noColor { + config.Client.TermColorsEnabled = false + } if displayVersion { version.PrintAndExit() diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go index 1a05549..8a38069 100644 --- a/cmd/dmap/main.go +++ b/cmd/dmap/main.go @@ -6,7 +6,6 @@ import ( "os" "github.com/mimecast/dtail/internal/clients" - "github.com/mimecast/dtail/internal/color" "github.com/mimecast/dtail/internal/config" "github.com/mimecast/dtail/internal/io/logger" "github.com/mimecast/dtail/internal/io/signal" @@ -49,7 +48,9 @@ func main() { flag.Parse() config.Read(cfgFile, sshPort) - color.Colored = !noColor + if noColor { + config.Client.TermColorsEnabled = false + } if displayVersion { version.PrintAndExit() diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index 07f5270..5993481 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -12,7 +12,6 @@ import ( "syscall" "time" - "github.com/mimecast/dtail/internal/color" "github.com/mimecast/dtail/internal/config" "github.com/mimecast/dtail/internal/io/logger" "github.com/mimecast/dtail/internal/server" @@ -25,7 +24,7 @@ func main() { var cfgFile string var debugEnable bool var displayVersion bool - var noColor bool + var color bool var pprof int var shutdownAfter int var sshPort int @@ -35,16 +34,15 @@ func main() { flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages") flag.BoolVar(&displayVersion, "version", false, "Display version") flag.BoolVar(&config.ServerRelaxedAuthEnable, "relaxedAuth", false, "Enable relaxced SSH auth mode (don't use in production!)") - flag.BoolVar(&noColor, "noColor", false, "Disable ANSII terminal colors") + flag.BoolVar(&color, "color", false, "Enable ANSII terminal colors") flag.IntVar(&pprof, "pprof", -1, "Start PProf server this port") flag.IntVar(&shutdownAfter, "shutdownAfter", 0, "Automatically shutdown after so many seconds") flag.IntVar(&sshPort, "port", 2222, "SSH server port") flag.StringVar(&cfgFile, "cfg", "", "Config file path") flag.Parse() - config.Read(cfgFile, sshPort) - color.Colored = !noColor + config.Client.TermColorsEnabled = color if displayVersion { version.PrintAndExit() diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go index f2a039f..178ea52 100644 --- a/cmd/dtail/main.go +++ b/cmd/dtail/main.go @@ -11,7 +11,6 @@ import ( "time" "github.com/mimecast/dtail/internal/clients" - "github.com/mimecast/dtail/internal/color" "github.com/mimecast/dtail/internal/config" "github.com/mimecast/dtail/internal/io/logger" "github.com/mimecast/dtail/internal/io/signal" @@ -65,7 +64,9 @@ func main() { } config.Read(cfgFile, sshPort) - color.Colored = !noColor + if noColor { + config.Client.TermColorsEnabled = false + } if displayVersion { version.PrintAndExit() |