diff options
-rw-r--r-- | helpers/general.go | 10 | ||||
-rw-r--r-- | hugolib/page_output.go | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/helpers/general.go b/helpers/general.go index f9e67e72d..327aafdc6 100644 --- a/helpers/general.go +++ b/helpers/general.go @@ -250,6 +250,11 @@ func NewDistinctErrorLogger() *DistinctLogger { return &DistinctLogger{m: make(map[string]bool), logger: jww.ERROR} } +// NewDistinctWarnLogger creates a new DistinctLogger that logs WARNs +func NewDistinctWarnLogger() *DistinctLogger { + return &DistinctLogger{m: make(map[string]bool), logger: jww.WARN} +} + // NewDistinctFeedbackLogger creates a new DistinctLogger that can be used // to give feedback to the user while not spamming with duplicates. func NewDistinctFeedbackLogger() *DistinctLogger { @@ -260,13 +265,16 @@ var ( // DistinctErrorLog can be used to avoid spamming the logs with errors. DistinctErrorLog = NewDistinctErrorLogger() + // DistinctWarnLog can be used to avoid spamming the logs with warnings. + DistinctWarnLog = NewDistinctWarnLogger() + // DistinctFeedbackLog can be used to avoid spamming the logs with info messages. DistinctFeedbackLog = NewDistinctFeedbackLogger() ) // InitLoggers sets up the global distinct loggers. func InitLoggers() { - DistinctErrorLog = NewDistinctErrorLogger() + jww.ResetLogCounters() } // Deprecated informs about a deprecation, but only once for a given set of arguments' values. diff --git a/hugolib/page_output.go b/hugolib/page_output.go index 837e41549..f47343cb5 100644 --- a/hugolib/page_output.go +++ b/hugolib/page_output.go @@ -104,7 +104,7 @@ func (p *PageOutput) layouts(layouts ...string) ([]string, error) { func (p *PageOutput) Render(layout ...string) template.HTML { if !p.checkRender() { - return template.HTML("") + return "" } l, err := p.layouts(layout...) @@ -117,7 +117,7 @@ func (p *PageOutput) Render(layout ...string) template.HTML { func (p *Page) Render(layout ...string) template.HTML { if !p.checkRender() { - return template.HTML("") + return "" } p.pageOutputInit.Do(func() { @@ -142,7 +142,7 @@ func (p *Page) Render(layout ...string) template.HTML { // for list pages. func (p *Page) checkRender() bool { if p.Kind != KindPage { - helpers.DistinctErrorLog.Printf(".Render only available for regular pages, not for of kind %q. You probably meant .Site.RegularPages and not.Site.Pages.", p.Kind) + helpers.DistinctWarnLog.Printf(".Render only available for regular pages, not for of kind %q. You probably meant .Site.RegularPages and not.Site.Pages.", p.Kind) return false } return true |