-
-
Notifications
You must be signed in to change notification settings - Fork 7.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace the old log setup, with structured logging etc.
- Loading branch information
Showing
79 changed files
with
1,089 additions
and
939 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| // Copyright 2023 The Hugo Authors. All rights reserved. | ||
| // Some functions in this file (see comments) is based on the Go source code, | ||
| // copyright The Go Authors and governed by a BSD-style license. | ||
| // | ||
| // 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 contains some basic logging setup. | ||
| package loggers | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io" | ||
| "sync" | ||
|
|
||
| "github.com/bep/logg" | ||
|
|
||
| "github.com/fatih/color" | ||
| ) | ||
|
|
||
| var bold = color.New(color.Bold) | ||
|
|
||
| // Colors mapping. | ||
| var Colors = [...]*color.Color{ | ||
| logg.LevelDebug: color.New(color.FgWhite), | ||
| logg.LevelInfo: color.New(color.FgBlue), | ||
| logg.LevelWarn: color.New(color.FgYellow), | ||
| logg.LevelError: color.New(color.FgRed), | ||
| } | ||
|
|
||
| // Strings mapping. | ||
| var Strings = [...]string{ | ||
| logg.LevelDebug: "[debug]", | ||
| logg.LevelInfo: "[info] ", | ||
| logg.LevelWarn: "[warn]]", | ||
| logg.LevelError: "[error]", | ||
| } | ||
|
|
||
| // newDefaultHandler handler. | ||
| func newDefaultHandler(outWriter, errWriter io.Writer) logg.Handler { | ||
| return &defaultHandler{ | ||
| outWriter: outWriter, | ||
| errWriter: errWriter, | ||
| Padding: 0, | ||
| } | ||
| } | ||
|
|
||
| // Default Handler implementation. | ||
| // Based on https://github.com/apex/log/blob/master/handlers/cli/cli.go | ||
| type defaultHandler struct { | ||
| mu sync.Mutex | ||
| outWriter io.Writer // Defaults to os.Stdout. | ||
| errWriter io.Writer // Defaults to os.Stderr. | ||
|
|
||
| Padding int | ||
| } | ||
|
|
||
| // HandleLog implements logg.Handler. | ||
| func (h *defaultHandler) HandleLog(e *logg.Entry) error { | ||
| color := Colors[e.Level] | ||
| level := Strings[e.Level] | ||
|
|
||
| h.mu.Lock() | ||
| defer h.mu.Unlock() | ||
|
|
||
| var w io.Writer | ||
| if e.Level > logg.LevelInfo { | ||
| w = h.errWriter | ||
| } else { | ||
| w = h.outWriter | ||
| } | ||
|
|
||
| const cmdName = "cmd" | ||
|
|
||
| var prefix string | ||
| for _, field := range e.Fields { | ||
| if field.Name == cmdName { | ||
| prefix = fmt.Sprint(field.Value) | ||
| break | ||
| } | ||
| } | ||
|
|
||
| if prefix != "" { | ||
| prefix = prefix + ": " | ||
| } | ||
|
|
||
| color.Fprintf(w, "%s %s%s", bold.Sprintf("%*s", h.Padding+1, level), color.Sprint(prefix), e.Message) | ||
|
|
||
| for _, field := range e.Fields { | ||
| if field.Name == cmdName { | ||
| continue | ||
| } | ||
| fmt.Fprintf(w, " %s %v", color.Sprint(field.Name), field.Value) | ||
| } | ||
|
|
||
| fmt.Fprintln(w) | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.