mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-31 22:41:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow getJSON errors to be ignored

Browse Source 
This change is mostly motivated to get a more stable CI build (we're building the Hugo site there, with Instagram and Twitter shortcodes sometimes failing).

Fixes #7866
This commit is contained in:
Bjørn Erik Pedersen
2020-10-21 11:17:48 +02:00
parent 8cbe2bbfad
commit fdfa4a5fe6
52 changed files with 318 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/page/pagemeta/page_frontmatter.go
View File

@@ -38,7 +38,7 @@ type FrontMatterHandler struct {
// A map of all date keys configured, including any custom.
allDateKeys map[string]bool
logger *loggers.Logger
logger loggers.Logger
}
// FrontMatterDescriptor describes how to handle front matter for a given Page.
@@ -148,7 +148,7 @@ func (f FrontMatterHandler) newChainedFrontMatterFieldHandler(handlers ...frontM
// First successful handler wins.
success, err := h(d)
if err != nil {
f.logger.ERROR.Println(err)
f.logger.Errorln(err)
} else if success {
return true, nil
}
@@ -262,7 +262,7 @@ func toLowerSlice(in interface{}) []string {
// NewFrontmatterHandler creates a new FrontMatterHandler with the given logger and configuration.
// If no logger is provided, one will be created.
func NewFrontmatterHandler(logger *loggers.Logger, cfg config.Provider) (FrontMatterHandler, error) {
func NewFrontmatterHandler(logger loggers.Logger, cfg config.Provider) (FrontMatterHandler, error) {
if logger == nil {
logger = loggers.NewErrorLogger()

4
resources/resource_spec.go
View File

@@ -47,7 +47,7 @@ func NewSpec(
s *helpers.PathSpec,
fileCaches filecache.Caches,
incr identity.Incrementer,
logger *loggers.Logger,
logger loggers.Logger,
errorHandler herrors.ErrorSender,
outputFormats output.Formats,
mimeTypes media.Types) (*Spec, error) {
@@ -105,7 +105,7 @@ type Spec struct {
MediaTypes media.Types
OutputFormats output.Formats
Logger *loggers.Logger
Logger loggers.Logger
ErrorSender herrors.ErrorSender
TextTemplates tpl.TemplateParseFinder

4
resources/resource_transformers/babel/babel.go
View File

@@ -121,7 +121,7 @@ func (t *babelTransformation) Transform(ctx *resources.ResourceTransformationCtx
logger := t.rs.Logger
var errBuf bytes.Buffer
infoW := loggers.LoggerToWriterWithPrefix(logger.INFO, "babel")
infoW := loggers.LoggerToWriterWithPrefix(logger.Info(), "babel")
if t.options.Config != "" {
configFile = t.options.Config
@@ -143,7 +143,7 @@ func (t *babelTransformation) Transform(ctx *resources.ResourceTransformationCtx
var cmdArgs []string
if configFile != "" {
logger.INFO.Println("babel: use config file", configFile)
logger.Infoln("babel: use config file", configFile)
cmdArgs = []string{"--config-file", configFile}
}

10
resources/resource_transformers/postcss/postcss.go
View File

@@ -181,7 +181,7 @@ func (t *postcssTransformation) Transform(ctx *resources.ResourceTransformationC
var cmdArgs []string
if configFile != "" {
logger.INFO.Println("postcss: use config file", configFile)
logger.Infoln("postcss: use config file", configFile)
cmdArgs = []string{"--config", configFile}
}
@@ -192,7 +192,7 @@ func (t *postcssTransformation) Transform(ctx *resources.ResourceTransformationC
cmd := exec.Command(binary, cmdArgs...)
var errBuf bytes.Buffer
infoW := loggers.LoggerToWriterWithPrefix(logger.INFO, "postcss")
infoW := loggers.LoggerToWriterWithPrefix(logger.Info(), "postcss")
cmd.Stdout = ctx.To
cmd.Stderr = io.MultiWriter(infoW, &errBuf)
@@ -245,10 +245,10 @@ type importResolver struct {
contentSeen map[string]bool
linemap map[int]fileOffset
fs afero.Fs
logger *loggers.Logger
logger loggers.Logger
}
func newImportResolver(r io.Reader, inPath string, fs afero.Fs, logger *loggers.Logger) *importResolver {
func newImportResolver(r io.Reader, inPath string, fs afero.Fs, logger loggers.Logger) *importResolver {
return &importResolver{
r: r,
inPath: inPath,
@@ -296,7 +296,7 @@ func (imp *importResolver) importRecursive(
importContent, hash := imp.contentHash(filename)
if importContent == nil {
trackLine(i, offset, "ERROR")
imp.logger.WARN.Printf("postcss: Failed to resolve CSS @import in %q for path %q", inPath, filename)
imp.logger.Warnf("postcss: Failed to resolve CSS @import in %q for path %q", inPath, filename)
continue
}

4
resources/transform.go
View File

@@ -290,7 +290,7 @@ func (r *resourceAdapter) publish() {
r.publisherErr = r.target.Publish()
if r.publisherErr != nil {
r.spec.Logger.ERROR.Printf("Failed to publish Resource: %s", r.publisherErr)
r.spec.Logger.Errorf("Failed to publish Resource: %s", r.publisherErr)
}
})
@@ -546,7 +546,7 @@ func (r *resourceAdapter) initTransform(publish, setContent bool) {
if r.spec.ErrorSender != nil {
r.spec.ErrorSender.SendError(r.transformationsErr)
} else {
r.spec.Logger.ERROR.Printf("Transformation failed: %s", r.transformationsErr)
r.spec.Logger.Errorf("Transformation failed: %s", r.transformationsErr)
}
}
})