Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add timestamp to logs #1211

Merged
merged 6 commits into from
May 4, 2020
Merged

Add timestamp to logs #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41a95fe
Add timestamp to logs
jonhenrik13 Apr 23, 2020
d88e998
update Makefile
tejal29 May 4, 2020
94ee809
Merge branch 'master' into log-timestamp-v0.19.0
tejal29 May 4, 2020
da051c0
fix gofmt
tejal29 May 4, 2020
0db3579
fix formatiing
tejal29 May 4, 2020
0f67b78
fix formatting.
tejal29 May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions cmd/executor/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,18 @@ import (
)

var (
opts = &config.KanikoOptions{}
ctxSubPath string
force bool
logLevel string
logFormat string
opts = &config.KanikoOptions{}
ctxSubPath string
force bool
logLevel string
logFormat string
logTimestamp bool
)

func init() {
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().BoolVar(&logTimestamp, "log-timestamp", logging.DefaultLogTimestamp, "Timestamp in log output")
RootCmd.PersistentFlags().BoolVarP(&force, "force", "", false, "Force building outside of a container")

addKanikoOptionsFlags()
Expand All @@ -62,7 +64,7 @@ var RootCmd = &cobra.Command{
if cmd.Use == "executor" {
resolveEnvironmentBuildArgs(opts.BuildArgs, os.Getenv)

if err := logging.Configure(logLevel, logFormat); err != nil {
if err := logging.Configure(logLevel, logFormat, logTimestamp); err != nil {
return err
}

Expand Down
10 changes: 6 additions & 4 deletions cmd/warmer/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,16 @@ import (
)

var (
opts = &config.WarmerOptions{}
logLevel string
logFormat string
opts = &config.WarmerOptions{}
logLevel string
logFormat string
logTimestamp bool
)

func init() {
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().BoolVar(&logTimestamp, "log-timestamp", logging.DefaultLogTimestamp, "Timestamp in log output")

addKanikoOptionsFlags()
addHiddenFlags()
Expand All @@ -45,7 +47,7 @@ func init() {
var RootCmd = &cobra.Command{
Use: "cache warmer",
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
}

Expand Down
8 changes: 6 additions & 2 deletions pkg/logging/logging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import (
const (
// Default log level
DefaultLevel = "info"
// Default timestamp in logs
DefaultLogTimestamp = false

// Text format
FormatText = "text"
Expand All @@ -36,7 +38,7 @@ const (
)

// 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)
if err != nil {
return errors.Wrap(err, "parsing log level")
Expand All @@ -48,10 +50,12 @@ func Configure(level, format string) error {
case FormatText:
formatter = &logrus.TextFormatter{
DisableColors: true,
FullTimestamp: logTimestamp,
}
case FormatColor:
formatter = &logrus.TextFormatter{
ForceColors: true,
ForceColors: true,
FullTimestamp: logTimestamp,
}
case FormatJSON:
formatter = &logrus.JSONFormatter{}
Expand Down