mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-29 09:52:10 -05:00
9f5a92078a
This commit implements Hugo Modules. This is a broad subject, but some keywords include: * A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project. * A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects. * Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running. * Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions. * A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`. All of the above is backed by Go Modules. Fixes #5973 Fixes #5996 Fixes #6010 Fixes #5911 Fixes #5940 Fixes #6074 Fixes #6082 Fixes #6092
176 lines
4.6 KiB
Go
176 lines
4.6 KiB
Go
// Copyright 2018 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package loggers
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"io/ioutil"
|
|
"log"
|
|
"os"
|
|
"regexp"
|
|
|
|
"github.com/gohugoio/hugo/common/terminal"
|
|
|
|
jww "github.com/spf13/jwalterweatherman"
|
|
)
|
|
|
|
var (
|
|
// Counts ERROR logs to the global jww logger.
|
|
GlobalErrorCounter *jww.Counter
|
|
)
|
|
|
|
func init() {
|
|
GlobalErrorCounter = &jww.Counter{}
|
|
jww.SetLogListeners(jww.LogCounter(GlobalErrorCounter, jww.LevelError))
|
|
}
|
|
|
|
// Logger wraps a *loggers.Logger and some other related logging state.
|
|
type Logger struct {
|
|
*jww.Notepad
|
|
ErrorCounter *jww.Counter
|
|
WarnCounter *jww.Counter
|
|
|
|
// This is only set in server mode.
|
|
errors *bytes.Buffer
|
|
}
|
|
|
|
func (l *Logger) Errors() string {
|
|
if l.errors == nil {
|
|
return ""
|
|
}
|
|
return ansiColorRe.ReplaceAllString(l.errors.String(), "")
|
|
}
|
|
|
|
// Reset resets the logger's internal state.
|
|
func (l *Logger) Reset() {
|
|
l.ErrorCounter.Reset()
|
|
if l.errors != nil {
|
|
l.errors.Reset()
|
|
}
|
|
}
|
|
|
|
// NewLogger creates a new Logger for the given thresholds
|
|
func NewLogger(stdoutThreshold, logThreshold jww.Threshold, outHandle, logHandle io.Writer, saveErrors bool) *Logger {
|
|
return newLogger(stdoutThreshold, logThreshold, outHandle, logHandle, saveErrors)
|
|
}
|
|
|
|
// NewDebugLogger is a convenience function to create a debug logger.
|
|
func NewDebugLogger() *Logger {
|
|
return newBasicLogger(jww.LevelDebug)
|
|
}
|
|
|
|
// NewWarningLogger is a convenience function to create a warning logger.
|
|
func NewWarningLogger() *Logger {
|
|
return newBasicLogger(jww.LevelWarn)
|
|
}
|
|
|
|
// NewErrorLogger is a convenience function to create an error logger.
|
|
func NewErrorLogger() *Logger {
|
|
return newBasicLogger(jww.LevelError)
|
|
}
|
|
|
|
var (
|
|
ansiColorRe = regexp.MustCompile("(?s)\\033\\[\\d*(;\\d*)*m")
|
|
errorRe = regexp.MustCompile("^(ERROR|FATAL|WARN)")
|
|
)
|
|
|
|
type ansiCleaner struct {
|
|
w io.Writer
|
|
}
|
|
|
|
func (a ansiCleaner) Write(p []byte) (n int, err error) {
|
|
return a.w.Write(ansiColorRe.ReplaceAll(p, []byte("")))
|
|
}
|
|
|
|
type labelColorizer struct {
|
|
w io.Writer
|
|
}
|
|
|
|
func (a labelColorizer) Write(p []byte) (n int, err error) {
|
|
replaced := errorRe.ReplaceAllStringFunc(string(p), func(m string) string {
|
|
switch m {
|
|
case "ERROR", "FATAL":
|
|
return terminal.Error(m)
|
|
case "WARN":
|
|
return terminal.Warning(m)
|
|
default:
|
|
return m
|
|
}
|
|
})
|
|
// io.MultiWriter will abort if we return a bigger write count than input
|
|
// bytes, so we lie a little.
|
|
_, err = a.w.Write([]byte(replaced))
|
|
return len(p), err
|
|
|
|
}
|
|
|
|
// InitGlobalLogger initializes the global logger, used in some rare cases.
|
|
func InitGlobalLogger(stdoutThreshold, logThreshold jww.Threshold, outHandle, logHandle io.Writer) {
|
|
outHandle, logHandle = getLogWriters(outHandle, logHandle)
|
|
|
|
jww.SetStdoutOutput(outHandle)
|
|
jww.SetLogOutput(logHandle)
|
|
jww.SetLogThreshold(logThreshold)
|
|
jww.SetStdoutThreshold(stdoutThreshold)
|
|
|
|
}
|
|
|
|
func getLogWriters(outHandle, logHandle io.Writer) (io.Writer, io.Writer) {
|
|
isTerm := terminal.IsTerminal(os.Stdout)
|
|
if logHandle != ioutil.Discard && isTerm {
|
|
// Remove any Ansi coloring from log output
|
|
logHandle = ansiCleaner{w: logHandle}
|
|
}
|
|
|
|
if isTerm {
|
|
outHandle = labelColorizer{w: outHandle}
|
|
}
|
|
|
|
return outHandle, logHandle
|
|
|
|
}
|
|
|
|
func newLogger(stdoutThreshold, logThreshold jww.Threshold, outHandle, logHandle io.Writer, saveErrors bool) *Logger {
|
|
errorCounter := &jww.Counter{}
|
|
warnCounter := &jww.Counter{}
|
|
outHandle, logHandle = getLogWriters(outHandle, logHandle)
|
|
|
|
listeners := []jww.LogListener{jww.LogCounter(errorCounter, jww.LevelError), jww.LogCounter(warnCounter, jww.LevelWarn)}
|
|
var errorBuff *bytes.Buffer
|
|
if saveErrors {
|
|
errorBuff = new(bytes.Buffer)
|
|
errorCapture := func(t jww.Threshold) io.Writer {
|
|
if t != jww.LevelError {
|
|
// Only interested in ERROR
|
|
return nil
|
|
}
|
|
|
|
return errorBuff
|
|
}
|
|
|
|
listeners = append(listeners, errorCapture)
|
|
}
|
|
|
|
return &Logger{
|
|
Notepad: jww.NewNotepad(stdoutThreshold, logThreshold, outHandle, logHandle, "", log.Ldate|log.Ltime, listeners...),
|
|
ErrorCounter: errorCounter,
|
|
WarnCounter: warnCounter,
|
|
errors: errorBuff,
|
|
}
|
|
}
|
|
|
|
func newBasicLogger(t jww.Threshold) *Logger {
|
|
return newLogger(t, jww.LevelError, os.Stdout, ioutil.Discard, false)
|
|
}
|