Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: use lipgloss@alpha and shampoo.Writer
- Loading branch information
1 parent
958009c
commit a458738
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,8 +11,7 @@ import ( | |
| "sync/atomic" | ||
| "time" | ||
|
|
||
| "github.com/charmbracelet/shampoo" | ||
|
Check failure on line 14 in logger.go
|
||
| ) | ||
|
|
||
| // ErrMissingValue is returned when a key is missing a value. | ||
|
|
@@ -23,10 +22,9 @@ type LoggerOption = func(*Logger) | |
|
|
||
| // Logger is a Logger that implements Logger. | ||
| type Logger struct { | ||
| w *shampoo.Writer | ||
| b bytes.Buffer | ||
| mu *sync.RWMutex | ||
|
|
||
| isDiscard uint32 | ||
|
|
||
|
|
@@ -133,8 +131,8 @@ func (l *Logger) handle(level Level, ts time.Time, frames []runtime.Frame, msg i | |
| l.textFormatter(kvs...) | ||
| } | ||
|
|
||
| l.w.Write(l.b.Bytes()) //nolint: errcheck | ||
| l.b.Reset() | ||
| } | ||
|
|
||
| // Helper marks the calling function as a helper | ||
|
|
@@ -272,19 +270,12 @@ func (l *Logger) SetOutput(w io.Writer) { | |
| if w == nil { | ||
| w = os.Stderr | ||
| } | ||
| l.w = shampoo.NewWriter(w, os.Environ()) | ||
| var isDiscard uint32 | ||
| if w == io.Discard { | ||
| isDiscard = 1 | ||
| } | ||
| atomic.StoreUint32(&l.isDiscard, isDiscard) | ||
| } | ||
|
|
||
| // SetFormatter sets the formatter. | ||
|
|
@@ -310,8 +301,8 @@ func (l *Logger) SetCallerOffset(offset int) { | |
|
|
||
| // SetColorProfile force sets the underlying Lip Gloss renderer color profile | ||
| // for the TextFormatter. | ||
| func (l *Logger) SetColorProfile(profile shampoo.Profile) { | ||
| l.w.Profile = profile | ||
| } | ||
|
|
||
| // SetStyles sets the logger styles for the TextFormatter. | ||
|
|
||
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
Oops, something went wrong.