MM-42570: Update dependencies (#19901)
https://mattermost.atlassian.net/browse/MM-42570 ```release-note NONE ```
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
49e68bb230
Коммит
bc69069a83
2
vendor/github.com/hashicorp/go-hclog/colorize_unix.go
сгенерированный
поставляемый
2
vendor/github.com/hashicorp/go-hclog/colorize_unix.go
сгенерированный
поставляемый
@@ -1,3 +1,4 @@
|
||||
//go:build !windows
|
||||
// +build !windows
|
||||
|
||||
package hclog
|
||||
@@ -21,6 +22,7 @@ func (l *intLogger) setColorization(opts *LoggerOptions) {
|
||||
isCygwinTerm := isatty.IsCygwinTerminal(fi.Fd())
|
||||
isTerm := isUnixTerm || isCygwinTerm
|
||||
if !isTerm {
|
||||
l.headerColor = ColorOff
|
||||
l.writer.color = ColorOff
|
||||
}
|
||||
}
|
||||
|
||||
7
vendor/github.com/hashicorp/go-hclog/colorize_windows.go
сгенерированный
поставляемый
7
vendor/github.com/hashicorp/go-hclog/colorize_windows.go
сгенерированный
поставляемый
@@ -1,3 +1,4 @@
|
||||
//go:build windows
|
||||
// +build windows
|
||||
|
||||
package hclog
|
||||
@@ -26,8 +27,12 @@ func (l *intLogger) setColorization(opts *LoggerOptions) {
|
||||
isTerm := isUnixTerm || isCygwinTerm
|
||||
if !isTerm {
|
||||
l.writer.color = ColorOff
|
||||
l.headerColor = ColorOff
|
||||
return
|
||||
}
|
||||
l.writer.w = colorable.NewColorable(fi)
|
||||
|
||||
if l.headerColor == ColorOff {
|
||||
l.writer.w = colorable.NewColorable(fi)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
22
vendor/github.com/hashicorp/go-hclog/intlogger.go
сгенерированный
поставляемый
22
vendor/github.com/hashicorp/go-hclog/intlogger.go
сгенерированный
поставляемый
@@ -69,6 +69,8 @@ type intLogger struct {
|
||||
writer *writer
|
||||
level *int32
|
||||
|
||||
headerColor ColorOption
|
||||
|
||||
implied []interface{}
|
||||
|
||||
exclude func(level Level, msg string, args ...interface{}) bool
|
||||
@@ -113,6 +115,16 @@ func newLogger(opts *LoggerOptions) *intLogger {
|
||||
mutex = new(sync.Mutex)
|
||||
}
|
||||
|
||||
var primaryColor, headerColor ColorOption
|
||||
|
||||
if opts.ColorHeaderOnly {
|
||||
primaryColor = ColorOff
|
||||
headerColor = opts.Color
|
||||
} else {
|
||||
primaryColor = opts.Color
|
||||
headerColor = ColorOff
|
||||
}
|
||||
|
||||
l := &intLogger{
|
||||
json: opts.JSONFormat,
|
||||
name: opts.Name,
|
||||
@@ -120,10 +132,11 @@ func newLogger(opts *LoggerOptions) *intLogger {
|
||||
timeFn: time.Now,
|
||||
disableTime: opts.DisableTime,
|
||||
mutex: mutex,
|
||||
writer: newWriter(output, opts.Color),
|
||||
writer: newWriter(output, primaryColor),
|
||||
level: new(int32),
|
||||
exclude: opts.Exclude,
|
||||
independentLevels: opts.IndependentLevels,
|
||||
headerColor: headerColor,
|
||||
}
|
||||
if opts.IncludeLocation {
|
||||
l.callerOffset = offsetIntLogger + opts.AdditionalLocationOffset
|
||||
@@ -232,7 +245,12 @@ func (l *intLogger) logPlain(t time.Time, name string, level Level, msg string,
|
||||
|
||||
s, ok := _levelToBracket[level]
|
||||
if ok {
|
||||
l.writer.WriteString(s)
|
||||
if l.headerColor != ColorOff {
|
||||
color := _levelToColor[level]
|
||||
color.Fprint(l.writer, s)
|
||||
} else {
|
||||
l.writer.WriteString(s)
|
||||
}
|
||||
} else {
|
||||
l.writer.WriteString("[?????]")
|
||||
}
|
||||
|
||||
3
vendor/github.com/hashicorp/go-hclog/logger.go
сгенерированный
поставляемый
3
vendor/github.com/hashicorp/go-hclog/logger.go
сгенерированный
поставляемый
@@ -271,6 +271,9 @@ type LoggerOptions struct {
|
||||
// are concretely instances of *os.File.
|
||||
Color ColorOption
|
||||
|
||||
// Only color the header, not the body. This can help with readability of long messages.
|
||||
ColorHeaderOnly bool
|
||||
|
||||
// A function which is called with the log information and if it returns true the value
|
||||
// should not be logged.
|
||||
// This is useful when interacting with a system that you wish to suppress the log
|
||||
|
||||
Ссылка в новой задаче
Block a user