common/loggers: Remove the ANSI color for the browser error version

diff --git a/commands/commandeer.go b/commands/commandeer.go
index 94b2c65536fc7766a9454f9b8c7eca8d74db645e..3d4d0ff1be13dcc82a64bdac211eb8f5ce2d0abc 100644 (file)
--- a/commands/commandeer.go
+++ b/commands/commandeer.go
@@ -104,7 +104,7 @@ func (c *commandeer) getErrorWithContext() interface{} {
 
        m := make(map[string]interface{})
 
-       m["Error"] = errors.New(removeErrorPrefixFromLog(c.logger.Errors.String()))
+       m["Error"] = errors.New(removeErrorPrefixFromLog(c.logger.Errors()))
        m["Version"] = hugoVersionString()
 
        fe := herrors.UnwrapErrorWithFileContext(c.buildErr)

diff --git a/common/loggers/loggers.go b/common/loggers/loggers.go
index 0bc76a0f32c6113665d5157570f2e06b4155430f..428a9f79c00beb6e1d649ccb659d758a689ff500 100644 (file)
--- a/common/loggers/loggers.go
+++ b/common/loggers/loggers.go
@@ -42,14 +42,21 @@ type Logger struct {
        ErrorCounter *jww.Counter
 
        // This is only set in server mode.
-       Errors *bytes.Buffer
+       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()
+       if l.errors != nil {
+               l.errors.Reset()
        }
 }
 
@@ -108,7 +115,7 @@ func newLogger(stdoutThreshold, logThreshold jww.Threshold, outHandle, logHandle
        return &Logger{
                Notepad:      jww.NewNotepad(stdoutThreshold, logThreshold, outHandle, logHandle, "", log.Ldate|log.Ltime, listeners...),
                ErrorCounter: errorCounter,
-               Errors:       errorBuff,
+               errors:       errorBuff,
        }
 }