diff --git a/config/flags.go b/config/flags.go index dbb5cd26cbdd..d8397ce40a2c 100644 --- a/config/flags.go +++ b/config/flags.go @@ -22,7 +22,6 @@ import ( "github.com/ava-labs/avalanchego/utils/compression" "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/dynamicip" - "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/ulimit" "github.com/ava-labs/avalanchego/utils/units" "github.com/ava-labs/avalanchego/vms/components/gas" @@ -143,7 +142,7 @@ func addNodeFlags(fs *pflag.FlagSet) { fs.String(LogsDirKey, defaultLogDir, "Logging directory for Avalanche") fs.String(LogLevelKey, "info", "The log level. Should be one of {verbo, debug, trace, info, warn, error, fatal, off}") fs.String(LogDisplayLevelKey, "", "The log display level. If left blank, will inherit the value of log-level. Otherwise, should be one of {verbo, debug, trace, info, warn, error, fatal, off}") - fs.String(LogFormatKey, logging.FormatModeAuto, fmt.Sprintf("The structure of log format. Defaults to '%s' which formats terminal-like logs, when the output is a terminal. Otherwise, should be one of {%s, plain, colors, json}", logging.FormatModeAuto, logging.FormatModeAuto)) + fs.String(LogFormatKey, "auto", "The structure of log format. Defaults to 'auto' which formats terminal-like logs, when the output is a terminal. Otherwise, should be one of {auto, plain, colors, json}") fs.Uint(LogRotaterMaxSizeKey, 8, "The maximum file size in megabytes of the log file before it gets rotated.") fs.Uint(LogRotaterMaxFilesKey, 7, "The maximum number of old log files to retain. 0 means retain all old log files.") fs.Uint(LogRotaterMaxAgeKey, 0, "The maximum number of days to retain old log files based on the timestamp encoded in their filename. 0 means retain all old log files.") diff --git a/tests/fixture/bootstrapmonitor/cmd/main.go b/tests/fixture/bootstrapmonitor/cmd/main.go index af88d1d9eab7..1e04fd882ad6 100644 --- a/tests/fixture/bootstrapmonitor/cmd/main.go +++ b/tests/fixture/bootstrapmonitor/cmd/main.go @@ -40,7 +40,7 @@ func main() { rootCmd.PersistentFlags().StringVar(&podName, "pod-name", os.Getenv("POD_NAME"), "The name of the pod") rootCmd.PersistentFlags().StringVar(&nodeContainerName, "node-container-name", "", "The name of the node container in the pod") rootCmd.PersistentFlags().StringVar(&dataDir, "data-dir", "", "The path of the data directory used for the bootstrap job") - rootCmd.PersistentFlags().StringVar(&rawLogFormat, "log-format", logging.FormatModeAuto, fmt.Sprintf("The structure of log format. Defaults to '%s' which formats terminal-like logs, when the output is a terminal. Otherwise, should be one of {%s, plain, colors, json}", logging.FormatModeAuto, logging.FormatModeAuto)) + rootCmd.PersistentFlags().StringVar(&rawLogFormat, "log-format", "auto", "The structure of log format. Defaults to 'auto' which formats terminal-like logs, when the output is a terminal. Otherwise, should be one of {auto, plain, colors, json}") versionCmd := &cobra.Command{ Use: "version", diff --git a/tests/fixture/tmpnet/cmd/main.go b/tests/fixture/tmpnet/cmd/main.go index 78b9f64f6d5f..96859fba4d8f 100644 --- a/tests/fixture/tmpnet/cmd/main.go +++ b/tests/fixture/tmpnet/cmd/main.go @@ -17,7 +17,6 @@ import ( "github.com/ava-labs/avalanchego/tests" "github.com/ava-labs/avalanchego/tests/fixture/tmpnet" - "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/version" ) @@ -38,7 +37,7 @@ func main() { Short: "tmpnetctl commands", } rootCmd.PersistentFlags().StringVar(&networkDir, "network-dir", os.Getenv(tmpnet.NetworkDirEnvName), "The path to the configuration directory of a temporary network") - rootCmd.PersistentFlags().StringVar(&rawLogFormat, "log-format", logging.FormatModeAuto, fmt.Sprintf("The structure of log format. Defaults to '%s' which formats terminal-like logs, when the output is a terminal. Otherwise, should be one of {%s, plain, colors, json}", logging.FormatModeAuto, logging.FormatModeAuto)) + rootCmd.PersistentFlags().StringVar(&rawLogFormat, "log-format", "auto", "The structure of log format. Defaults to 'auto' which formats terminal-like logs, when the output is a terminal. Otherwise, should be one of {auto, plain, colors, json}") versionCmd := &cobra.Command{ Use: "version", diff --git a/tests/log.go b/tests/log.go index 8a6c4d7f4ca7..8e6271b8c014 100644 --- a/tests/log.go +++ b/tests/log.go @@ -37,7 +37,7 @@ func NewSimpleLogger(writeCloser io.WriteCloser) logging.Logger { } func NewDefaultLogger(prefix string) logging.Logger { - log, err := LoggerForFormat(prefix, logging.FormatModeAuto) + log, err := LoggerForFormat(prefix, "auto") if err != nil { // This should never happen since auto is a valid log format panic(err) diff --git a/utils/logging/format.go b/utils/logging/format.go index 7734fe49cf45..53313c3dad8f 100644 --- a/utils/logging/format.go +++ b/utils/logging/format.go @@ -18,8 +18,6 @@ const ( Colors JSON - FormatModeAuto = "auto" - termTimeFormat = "[01-02|15:04:05.000]" ) @@ -60,7 +58,7 @@ func ToFormat(h string, fd uintptr) (Format, error) { return Colors, nil case "JSON": return JSON, nil - case strings.ToUpper(FormatModeAuto): + case "AUTO": if !term.IsTerminal(int(fd)) { return Plain, nil }