Skip to content

Commit

Permalink
common/herrors: Make the file error log format configurable
Browse files Browse the repository at this point in the history
Will check for an OS environment variable named `HUGO_FILE_LOG_FORMAT`.

The tokens available are `:file` (absolute filename), `:line` (line number) and `:col` (column number).

The default format is: \":file::line::col\"`

How to set OS environment variables is OS specific, but an example on Unix setting an alternative format when running Hugo:

```bash
env HUGO_FILE_LOG_FORMAT="\":file::line\"" hugo
```

The above will include filename and line number quoted.

Fixes #5352
  • Loading branch information
bep committed Oct 27, 2018
1 parent dac7092 commit 1ad117c
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 5 deletions.
53 changes: 48 additions & 5 deletions common/herrors/error_locator.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,55 @@ import (
"github.com/spf13/afero"
)

var fileErrorFormat = "\"%s:%d:%d\": %s"
var fileErrorFormatFunc func(e ErrorContext) string

func init() {
if terminal.IsTerminal(os.Stdout) {
fileErrorFormat = terminal.Notice("\"%s:%d:%d\"") + ": %s"
func createFileLogFormatter(formatStr string) func(e ErrorContext) string {

if formatStr == "" {
formatStr = "\":file::line::col\""
}

var identifiers = []string{":file", ":line", ":col"}
var identifiersFound []string

for i := range formatStr {
for _, id := range identifiers {
if strings.HasPrefix(formatStr[i:], id) {
identifiersFound = append(identifiersFound, id)
}
}
}

replacer := strings.NewReplacer(":file", "%s", ":line", "%d", ":col", "%d")
format := replacer.Replace(formatStr)

f := func(e ErrorContext) string {
args := make([]interface{}, len(identifiersFound))
for i, id := range identifiersFound {
switch id {
case ":file":
args[i] = e.Filename
case ":line":
args[i] = e.LineNumber
case ":col":
args[i] = e.ColumnNumber
}
}

msg := fmt.Sprintf(format, args...)

if terminal.IsTerminal(os.Stdout) {
return terminal.Notice(msg)
}

return msg
}

return f
}

func init() {
fileErrorFormatFunc = createFileLogFormatter(os.Getenv("HUGO_FILE_LOG_FORMAT"))
}

// LineMatcher contains the elements used to match an error to a line
Expand Down Expand Up @@ -85,7 +128,7 @@ type ErrorWithFileContext struct {
}

func (e *ErrorWithFileContext) Error() string {
return fmt.Sprintf(fileErrorFormat, e.Filename, e.LineNumber, e.ColumnNumber, e.cause.Error())
return fileErrorFormatFunc(e.ErrorContext) + ": " + e.cause.Error()
}

func (e *ErrorWithFileContext) Cause() error {
Expand Down
12 changes: 12 additions & 0 deletions common/herrors/error_locator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,18 @@ import (
"github.com/stretchr/testify/require"
)

func TestCreateFileLogFormatter(t *testing.T) {
assert := require.New(t)

ctx := ErrorContext{Filename: "/my/file.txt", LineNumber: 12, ColumnNumber: 13}

assert.Equal("/my/file.txt|13|12", createFileLogFormatter(":file|:col|:line")(ctx))
assert.Equal("13|/my/file.txt|12", createFileLogFormatter(":col|:file|:line")(ctx))
assert.Equal("好:13", createFileLogFormatter("好::col")(ctx))
assert.Equal("\"/my/file.txt:12:13\"", createFileLogFormatter("")(ctx))

}

func TestErrorLocator(t *testing.T) {
assert := require.New(t)

Expand Down

0 comments on commit 1ad117c

Please sign in to comment.