From 4a5787b04f9ea08efda5023d17ba19a04f0dad86 Mon Sep 17 00:00:00 2001 From: Jeff Wu Date: Tue, 22 Dec 2020 16:25:02 -0800 Subject: [PATCH 1/4] Add a flag that prints timestamps in skaffold logs. --- cmd/skaffold/app/cmd/cmd.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cmd/skaffold/app/cmd/cmd.go b/cmd/skaffold/app/cmd/cmd.go index d8895e5d1d5..d7a41a8d089 100644 --- a/cmd/skaffold/app/cmd/cmd.go +++ b/cmd/skaffold/app/cmd/cmd.go @@ -44,6 +44,7 @@ var ( forceColors bool defaultColor int overwrite bool + timestamps bool ) func NewSkaffoldCommand(out, err io.Writer) *cobra.Command { @@ -69,7 +70,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 } @@ -168,7 +169,7 @@ func NewSkaffoldCommand(out, err io.Writer) *cobra.Command { rootCmd.PersistentFlags().IntVar(&defaultColor, "color", int(color.DefaultColorCode), "Specify the default output color in ANSI escape codes") rootCmd.PersistentFlags().BoolVar(&forceColors, "force-colors", false, "Always print color codes (hidden)") rootCmd.PersistentFlags().MarkHidden("force-colors") - + rootCmd.PersistentFlags().BoolVar(×tamps, "timestamps", false, "Print timestamp in skaffold logs.") setFlagsFromEnvVariables(rootCmd) return rootCmd @@ -235,13 +236,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 } From a5b9c380ec2e59e2e21ae69034aa61dc4d10c876 Mon Sep 17 00:00:00 2001 From: Jeff Wu Date: Tue, 22 Dec 2020 17:12:06 -0800 Subject: [PATCH 2/4] Add flag definition. --- cmd/skaffold/app/cmd/cmd.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/skaffold/app/cmd/cmd.go b/cmd/skaffold/app/cmd/cmd.go index 07fce13f092..e520afca7a3 100644 --- a/cmd/skaffold/app/cmd/cmd.go +++ b/cmd/skaffold/app/cmd/cmd.go @@ -183,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) From da05e4e79896090e2f73a28e1f99da669f9328bc Mon Sep 17 00:00:00 2001 From: Jeff Wu Date: Wed, 23 Dec 2020 11:58:22 -0800 Subject: [PATCH 3/4] Run ./hack/generate-man.sh --- docs/content/en/docs/references/cli/_index.md | 2 ++ 1 file changed, 2 insertions(+) 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) From 996aef5289c7c657e1680a7ae881dde3349305c7 Mon Sep 17 00:00:00 2001 From: Jeff Wu Date: Wed, 23 Dec 2020 12:01:24 -0800 Subject: [PATCH 4/4] gofmt cmd/skaffold/app/cmd/cmd.go --- cmd/skaffold/app/cmd/cmd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/skaffold/app/cmd/cmd.go b/cmd/skaffold/app/cmd/cmd.go index e520afca7a3..ce628e522a2 100644 --- a/cmd/skaffold/app/cmd/cmd.go +++ b/cmd/skaffold/app/cmd/cmd.go @@ -45,7 +45,7 @@ var ( forceColors bool overwrite bool interactive bool - timestamps bool + timestamps bool shutdownAPIServer func() error )