From 04ce8c7b4140c8bf250ea222a9b09dad19ac930e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Thu, 10 Mar 2022 22:31:01 +0100 Subject: [PATCH] Remove some logggin flags (note) Fix #9648 --- commands/commands.go | 11 ++--------- commands/hugo.go | 30 +----------------------------- 2 files changed, 3 insertions(+), 38 deletions(-) diff --git a/commands/commands.go b/commands/commands.go index 399f59af989..a5a09db0094 100644 --- a/commands/commands.go +++ b/commands/commands.go @@ -186,10 +186,6 @@ Complete documentation is available at http://gohugo.io/.`, _ = cc.cmd.PersistentFlags().SetAnnotation("config", cobra.BashCompFilenameExt, config.ValidConfigFileExtensions) cc.cmd.PersistentFlags().BoolVarP(&cc.verbose, "verbose", "v", false, "verbose output") - cc.cmd.PersistentFlags().BoolVarP(&cc.debug, "debug", "", false, "debug output") - cc.cmd.PersistentFlags().BoolVar(&cc.logging, "log", false, "enable Logging") - cc.cmd.PersistentFlags().StringVar(&cc.logFile, "logFile", "", "log File path (if set, logging enabled automatically)") - cc.cmd.PersistentFlags().BoolVar(&cc.verboseLog, "verboseLog", false, "verbose logging") cc.cmd.Flags().BoolVarP(&cc.buildWatch, "watch", "w", false, "watch filesystem for changes and recreate as needed") @@ -222,11 +218,8 @@ type hugoBuilderCommon struct { printm bool // TODO(bep) var vs string - logging bool - verbose bool - verboseLog bool - debug bool - quiet bool + verbose bool + quiet bool cfgFile string cfgDir string diff --git a/commands/hugo.go b/commands/hugo.go index 21140fa4307..77bc5f9c0eb 100644 --- a/commands/hugo.go +++ b/commands/hugo.go @@ -135,7 +135,6 @@ func (c *commandeer) createLogger(cfg config.Provider) (loggers.Logger, error) { var ( logHandle = ioutil.Discard logThreshold = jww.LevelWarn - logFile = cfg.GetString("logFile") outHandle = ioutil.Discard stdoutThreshold = jww.LevelWarn ) @@ -144,34 +143,10 @@ func (c *commandeer) createLogger(cfg config.Provider) (loggers.Logger, error) { outHandle = os.Stdout } - if c.h.verboseLog || c.h.logging || (c.h.logFile != "") { - var err error - if logFile != "" { - logHandle, err = os.OpenFile(logFile, os.O_RDWR|os.O_APPEND|os.O_CREATE, 0666) - if err != nil { - return nil, newSystemError("Failed to open log file:", logFile, err) - } - } else { - logHandle, err = ioutil.TempFile("", "hugo") - if err != nil { - return nil, newSystemError(err) - } - } - } else if !c.h.quiet && cfg.GetBool("verbose") { + if !c.h.quiet && cfg.GetBool("verbose") { stdoutThreshold = jww.LevelInfo } - if cfg.GetBool("debug") { - stdoutThreshold = jww.LevelDebug - } - - if c.h.verboseLog { - logThreshold = jww.LevelInfo - if cfg.GetBool("debug") { - logThreshold = jww.LevelDebug - } - } - loggers.InitGlobalLogger(stdoutThreshold, logThreshold, outHandle, logHandle) helpers.InitLoggers() @@ -180,9 +155,7 @@ func (c *commandeer) createLogger(cfg config.Provider) (loggers.Logger, error) { func initializeFlags(cmd *cobra.Command, cfg config.Provider) { persFlagKeys := []string{ - "debug", "verbose", - "logFile", // Moved from vars } flagKeys := []string{ @@ -221,7 +194,6 @@ func initializeFlags(cmd *cobra.Command, cfg config.Provider) { "printUnusedTemplates", "invalidateCDN", "layoutDir", - "logFile", "maxDeletes", "quiet", "renderToMemory",