Avoid double printing INFO deprecation messages

Fixes #11645

diff --git a/commands/commandeer.go b/commands/commandeer.go
index c3e2019b514d91a4386729ea279c557b52be64e0..5d414b04a2994c50725243d3ffaec33c5305a2ba 100644 (file)
--- a/commands/commandeer.go
+++ b/commands/commandeer.go
@@ -441,11 +441,11 @@ func (r *rootCommand) createLogger(running bool) (loggers.Logger, error) {
        }
 
        optsLogger := loggers.Options{
-               Distinct:    true,
-               Level:       level,
-               Stdout:      r.Out,
-               Stderr:      r.Out,
-               StoreErrors: running,
+               DistinctLevel: logg.LevelWarn,
+               Level:         level,
+               Stdout:        r.Out,
+               Stderr:        r.Out,
+               StoreErrors:   running,
        }
 
        return loggers.New(optsLogger), nil

diff --git a/common/loggers/logger.go b/common/loggers/logger.go
index a50502897b9dc358d509090e9211bd45d143d844..bc64ae0e5b7584ab38c4b6ca1caecf4084c45c75 100644 (file)
--- a/common/loggers/logger.go
+++ b/common/loggers/logger.go
@@ -40,7 +40,7 @@ type Options struct {
        Level              logg.Level
        Stdout             io.Writer
        Stderr             io.Writer
-       Distinct           bool
+       DistinctLevel      logg.Level
        StoreErrors        bool
        HandlerPost        func(e *logg.Entry) error
        SuppressStatements map[string]bool
@@ -92,8 +92,8 @@ func New(opts Options) Logger {
        logHandler = multi.New(handlers...)
 
        var logOnce *logOnceHandler
-       if opts.Distinct {
-               logOnce = newLogOnceHandler(logg.LevelWarn)
+       if opts.DistinctLevel != 0 {
+               logOnce = newLogOnceHandler(opts.DistinctLevel)
                logHandler = newStopHandler(logOnce, logHandler)
        }
 
@@ -137,10 +137,10 @@ func New(opts Options) Logger {
 // NewDefault creates a new logger with the default options.
 func NewDefault() Logger {
        opts := Options{
-               Distinct: true,
-               Level:    logg.LevelWarn,
-               Stdout:   os.Stdout,
-               Stderr:   os.Stdout,
+               DistinctLevel: logg.LevelWarn,
+               Level:         logg.LevelWarn,
+               Stdout:        os.Stdout,
+               Stderr:        os.Stdout,
        }
        return New(opts)
 }

diff --git a/common/loggers/logger_test.go b/common/loggers/logger_test.go
index 1b42eff53a6ce439e7e888b504122f91446c4948..6f589aafe999c4b61e55713b84228e1b3f81f9a5 100644 (file)
--- a/common/loggers/logger_test.go
+++ b/common/loggers/logger_test.go
@@ -29,10 +29,10 @@ func TestLogDistinct(t *testing.T) {
        c := qt.New(t)
 
        opts := loggers.Options{
-               Distinct:    true,
-               StoreErrors: true,
-               Stdout:      io.Discard,
-               Stderr:      io.Discard,
+               DistinctLevel: logg.LevelWarn,
+               StoreErrors:   true,
+               Stdout:        io.Discard,
+               Stderr:        io.Discard,
        }
 
        l := loggers.New(opts)
@@ -85,7 +85,6 @@ func TestOptionStoreErrors(t *testing.T) {
 
        c.Assert(sb.String(), qt.Contains, "error 1")
        c.Assert(sb.String(), qt.Contains, "ERROR")
-
 }
 
 func TestLogCount(t *testing.T) {
@@ -124,17 +123,16 @@ func TestSuppressStatements(t *testing.T) {
        c.Assert(errorsStr, qt.Not(qt.Contains), "error 1")
        c.Assert(errorsStr, qt.Contains, "error 2")
        c.Assert(l.LoggCount(logg.LevelError), qt.Equals, 1)
-
 }
 
 func TestReset(t *testing.T) {
        c := qt.New(t)
 
        opts := loggers.Options{
-               StoreErrors: true,
-               Distinct:    true,
-               Stdout:      io.Discard,
-               Stderr:      io.Discard,
+               StoreErrors:   true,
+               DistinctLevel: logg.LevelWarn,
+               Stdout:        io.Discard,
+               Stderr:        io.Discard,
        }
 
        l := loggers.New(opts)

diff --git a/common/loggers/loggerglobal.go b/common/loggers/loggerglobal.go
index 8b8e8cfc28295e6896fd72e07342c09966f721b9..6fd474a693505d1f6d844c9e53b6c9d2ea428b7a 100644 (file)
--- a/common/loggers/loggerglobal.go
+++ b/common/loggers/loggerglobal.go
@@ -31,9 +31,9 @@ func InitGlobalLogger(level logg.Level, panicOnWarnings bool) {
 
        log = New(
                Options{
-                       Level:       level,
-                       Distinct:    true,
-                       HandlerPost: logHookLast,
+                       Level:         level,
+                       DistinctLevel: logg.LevelInfo,
+                       HandlerPost:   logHookLast,
                },
        )
 }

diff --git a/hugolib/integrationtest_builder.go b/hugolib/integrationtest_builder.go
index 54085070c9d3b0a3304d661cfabe29c0b2e5824b..14509657a50c7dd7a62841c969fb8d8aa28fa37a 100644 (file)
--- a/hugolib/integrationtest_builder.go
+++ b/hugolib/integrationtest_builder.go
@@ -394,10 +394,10 @@ func (s *IntegrationTestBuilder) initBuilder() error {
 
                logger := loggers.New(
                        loggers.Options{
-                               Stdout:   w,
-                               Stderr:   w,
-                               Level:    s.Cfg.LogLevel,
-                               Distinct: true,
+                               Stdout:        w,
+                               Stderr:        w,
+                               Level:         s.Cfg.LogLevel,
+                               DistinctLevel: logg.LevelWarn,
                        },
                )
 

diff --git a/hugolib/site_new.go b/hugolib/site_new.go
index ac59e01c7abd2326b34ac659873862310138434a..da9d19f218f9461e3a3b277a78b99923b26abe5a 100644 (file)
--- a/hugolib/site_new.go
+++ b/hugolib/site_new.go
@@ -117,7 +117,7 @@ func NewHugoSites(cfg deps.DepsCfg) (*HugoSites, error) {
 
                logOpts := loggers.Options{
                        Level:              cfg.LogLevel,
-                       Distinct:           true, // This will drop duplicate log warning and errors.
+                       DistinctLevel:      logg.LevelWarn, // This will drop duplicate log warning and errors.
                        HandlerPost:        logHookLast,
                        Stdout:             cfg.LogOut,
                        Stderr:             cfg.LogOut,