Merge pull request #1203 from dani29/cache

Set very large logs to Trace level
GoogleContainerTools · May 1, 2020 · 36748fa · 36748fa
2 parents 7ccf05f + 04888f2
commit 36748fa
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -550,7 +550,7 @@ You need to set `--destination` as well (for example `--destination=image`).
 
 #### --verbosity
 
-Set this flag as `--verbosity=<panic|fatal|error|warn|info|debug>` to set the logging level. Defaults to `info`.
+Set this flag as `--verbosity=<panic|fatal|error|warn|info|debug|trace>` to set the logging level. Defaults to `info`.
 
 #### --whitelist-var-run
 

diff --git a/cmd/executor/cmd/root.go b/cmd/executor/cmd/root.go
@@ -47,9 +47,8 @@ var (
 )
 
 func init() {
- RootCmd.PersistentFlags().StringVarP(&logLevel, "verbosity", "v", logging.DefaultLevel, "Log level (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().BoolVarP(&force, "force", "", false, "Force building outside of a container")
 
  addKanikoOptionsFlags()

diff --git a/cmd/warmer/cmd/root.go b/cmd/warmer/cmd/root.go
@@ -35,7 +35,7 @@ var (
 )
 
 func init() {
- RootCmd.PersistentFlags().StringVarP(&logLevel, "verbosity", "v", logging.DefaultLevel, "Log level (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)")
 
  addKanikoOptionsFlags()

diff --git a/pkg/commands/copy.go b/pkg/commands/copy.go
@@ -207,7 +207,8 @@ func (cr *CachingCopyCommand) FilesUsedFromContext(config *v1.Config, buildArgs
 
 func (cr *CachingCopyCommand) FilesToSnapshot() []string {
  f := cr.extractedFiles
- logrus.Debugf("files extracted by caching copy command %s", f)
+ logrus.Debugf("%d files extracted by caching copy command", len(f))
+ logrus.Tracef("Extracted files: %s", f)
 
  return f
 }

diff --git a/pkg/commands/run.go b/pkg/commands/run.go
@@ -217,7 +217,8 @@ func (cr *CachingRunCommand) ExecuteCommand(config *v1.Config, buildArgs *docker
 
 func (cr *CachingRunCommand) FilesToSnapshot() []string {
  f := cr.extractedFiles
- logrus.Debugf("files extracted from caching run command %s", f)
+ logrus.Debugf("%d files extracted by caching run command", len(f))
+ logrus.Tracef("Extracted files: %s", f)
 
  return f
 }

diff --git a/pkg/filesystem/resolve.go b/pkg/filesystem/resolve.go
@@ -35,8 +35,8 @@ import (
 // output set.
 // * Add all ancestors of each path to the output set.
 func ResolvePaths(paths []string, wl []util.WhitelistEntry) (pathsToAdd []string, err error) {
- logrus.Info("Resolving paths")
- logrus.Debugf("Resolving paths %s", paths)
+ logrus.Infof("Resolving %d paths", len(paths))
+ logrus.Tracef("Resolving paths %s", paths)
 
  fileSet := make(map[string]bool)