diff --git a/cmd/skaffold/app/cmd/cmd.go b/cmd/skaffold/app/cmd/cmd.go index 6847dadf666..ce628e522a2 100644 --- a/cmd/skaffold/app/cmd/cmd.go +++ b/cmd/skaffold/app/cmd/cmd.go @@ -45,6 +45,7 @@ var ( forceColors bool overwrite bool interactive bool + timestamps bool shutdownAPIServer func() error ) @@ -76,7 +77,7 @@ func NewSkaffoldCommand(out, err io.Writer) *cobra.Command { cmd.Root().SetOutput(out) // Setup logs - if err := setUpLogs(err, v); err != nil { + if err := setUpLogs(err, v, timestamps); err != nil { return err } @@ -182,6 +183,7 @@ func NewSkaffoldCommand(out, err io.Writer) *cobra.Command { rootCmd.PersistentFlags().BoolVar(&forceColors, "force-colors", false, "Always print color codes (hidden)") rootCmd.PersistentFlags().BoolVar(&interactive, "interactive", true, "Allow user prompts for more information") rootCmd.PersistentFlags().BoolVar(&update.EnableCheck, "update-check", true, "Check for a more recent version of Skaffold") + rootCmd.PersistentFlags().BoolVar(×tamps, "timestamps", false, "Print timestamps in logs.") rootCmd.PersistentFlags().MarkHidden("force-colors") setFlagsFromEnvVariables(rootCmd) @@ -231,13 +233,16 @@ func FlagToEnvVarName(f *pflag.Flag) string { return fmt.Sprintf("SKAFFOLD_%s", strings.Replace(strings.ToUpper(f.Name), "-", "_", -1)) } -func setUpLogs(stdErr io.Writer, level string) error { +func setUpLogs(stdErr io.Writer, level string, timestamp bool) error { logrus.SetOutput(stdErr) lvl, err := logrus.ParseLevel(level) if err != nil { return fmt.Errorf("parsing log level: %w", err) } logrus.SetLevel(lvl) + logrus.SetFormatter(&logrus.TextFormatter{ + FullTimestamp: timestamp, + }) return nil } diff --git a/docs/content/en/docs/references/cli/_index.md b/docs/content/en/docs/references/cli/_index.md index 8c83fd5e32b..a73b4f36089 100644 --- a/docs/content/en/docs/references/cli/_index.md +++ b/docs/content/en/docs/references/cli/_index.md @@ -100,6 +100,7 @@ Env vars: * `SKAFFOLD_COLOR` (same as `--color`) * `SKAFFOLD_INTERACTIVE` (same as `--interactive`) +* `SKAFFOLD_TIMESTAMPS` (same as `--timestamps`) * `SKAFFOLD_UPDATE_CHECK` (same as `--update-check`) * `SKAFFOLD_VERBOSITY` (same as `--verbosity`) @@ -747,6 +748,7 @@ The following options can be passed to any command: --color=34: Specify the default output color in ANSI escape codes --interactive=true: Allow user prompts for more information + --timestamps=false: Print timestamps in logs. --update-check=true: Check for a more recent version of Skaffold -v, --verbosity='warning': Log level (debug, info, warn, error, fatal, panic)