public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1211 from jonhenrik13/log-timestamp-v0.19.0 

Add timestamp to logs
This commit is contained in:
Tejal Desai 2020-05-03 22:41:17 -07:00 committed by GitHub
parent e1c7862911 0f67b782fa
commit ae9c9b2813
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/executor/cmd/root.go
View File

@ -39,16 +39,18 @@ import (
) )
var ( var (
opts = &config.KanikoOptions{} opts = &config.KanikoOptions{}
ctxSubPath string ctxSubPath string
force bool force bool
logLevel string logLevel string
logFormat string logFormat string
logTimestamp bool
) )
func init() { func init() {
RootCmd.PersistentFlags().StringVarP(&logLevel, "verbosity", "v", logging.DefaultLevel, "Log level (trace, debug, info, warn, error, fatal, panic)") RootCmd.PersistentFlags().StringVarP(&logLevel, "verbosity", "v", logging.DefaultLevel, "Log level (trace, debug, info, warn, error, fatal, panic)")
RootCmd.PersistentFlags().StringVar(&logFormat, "log-format", logging.FormatColor, "Log format (text, color, json)") RootCmd.PersistentFlags().StringVar(&logFormat, "log-format", logging.FormatColor, "Log format (text, color, json)")
RootCmd.PersistentFlags().BoolVar(&logTimestamp, "log-timestamp", logging.DefaultLogTimestamp, "Timestamp in log output")
RootCmd.PersistentFlags().BoolVarP(&force, "force", "", false, "Force building outside of a container") RootCmd.PersistentFlags().BoolVarP(&force, "force", "", false, "Force building outside of a container")
addKanikoOptionsFlags() addKanikoOptionsFlags()
@ -62,7 +64,7 @@ var RootCmd = &cobra.Command{
if cmd.Use == "executor" { if cmd.Use == "executor" {
resolveEnvironmentBuildArgs(opts.BuildArgs, os.Getenv) resolveEnvironmentBuildArgs(opts.BuildArgs, os.Getenv)
if err := logging.Configure(logLevel, logFormat); err != nil { if err := logging.Configure(logLevel, logFormat, logTimestamp); err != nil {
return err return err
} }

10
cmd/warmer/cmd/root.go
View File

@ -29,14 +29,16 @@ import (
) )
var ( var (
opts = &config.WarmerOptions{} opts = &config.WarmerOptions{}
logLevel string logLevel string
logFormat string logFormat string
logTimestamp bool
) )
func init() { func init() {
RootCmd.PersistentFlags().StringVarP(&logLevel, "verbosity", "v", logging.DefaultLevel, "Log level (trace, debug, info, warn, error, fatal, panic)") RootCmd.PersistentFlags().StringVarP(&logLevel, "verbosity", "v", logging.DefaultLevel, "Log level (trace, debug, info, warn, error, fatal, panic)")
RootCmd.PersistentFlags().StringVar(&logFormat, "log-format", logging.FormatColor, "Log format (text, color, json)") RootCmd.PersistentFlags().StringVar(&logFormat, "log-format", logging.FormatColor, "Log format (text, color, json)")
RootCmd.PersistentFlags().BoolVar(&logTimestamp, "log-timestamp", logging.DefaultLogTimestamp, "Timestamp in log output")
addKanikoOptionsFlags() addKanikoOptionsFlags()
addHiddenFlags() addHiddenFlags()
@ -45,7 +47,7 @@ func init() {
var RootCmd = &cobra.Command{ var RootCmd = &cobra.Command{
Use: "cache warmer", Use: "cache warmer",
PersistentPreRunE: func(cmd *cobra.Command, args []string) error { PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
if err := logging.Configure(logLevel, logFormat); err != nil { if err := logging.Configure(logLevel, logFormat, logTimestamp); err != nil {
return err return err
} }

8
pkg/logging/logging.go
View File

@ -26,6 +26,8 @@ import (
const ( const (
// Default log level // Default log level
DefaultLevel = "info" DefaultLevel = "info"
// Default timestamp in logs
DefaultLogTimestamp = false
// Text format // Text format
FormatText = "text" FormatText = "text"
@ -36,7 +38,7 @@ const (
) )
// Configure sets the logrus logging level and formatter // Configure sets the logrus logging level and formatter
func Configure(level, format string) error { func Configure(level, format string, logTimestamp bool) error {
lvl, err := logrus.ParseLevel(level) lvl, err := logrus.ParseLevel(level)
if err != nil { if err != nil {
return errors.Wrap(err, "parsing log level") return errors.Wrap(err, "parsing log level")
@ -48,10 +50,12 @@ func Configure(level, format string) error {
case FormatText: case FormatText:
formatter = &logrus.TextFormatter{ formatter = &logrus.TextFormatter{
DisableColors: true, DisableColors: true,
FullTimestamp: logTimestamp,
} }
case FormatColor: case FormatColor:
formatter = &logrus.TextFormatter{ formatter = &logrus.TextFormatter{
ForceColors: true, ForceColors: true,
FullTimestamp: logTimestamp,
} }
case FormatJSON: case FormatJSON:
formatter = &logrus.JSONFormatter{} formatter = &logrus.JSONFormatter{}