-
Notifications
You must be signed in to change notification settings - Fork 4.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Direct plugin logs through vault's logger #3142
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| package pluginutil | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "fmt" | ||
| stdlog "log" | ||
| "strings" | ||
|
|
||
| hclog "github.com/hashicorp/go-hclog" | ||
| log "github.com/mgutz/logxi/v1" | ||
| ) | ||
|
|
||
| // pluginLogFaker is a wrapper on logxi.Logger that | ||
| // implements hclog.Logger | ||
| type hclogFaker struct { | ||
| logger log.Logger | ||
|
|
||
| name string | ||
| implied []interface{} | ||
| } | ||
|
|
||
| func (f *hclogFaker) buildLog(msg string, args ...interface{}) (string, []interface{}) { | ||
| if f.name != "" { | ||
| msg = fmt.Sprintf("%s: %s", f.name, msg) | ||
| } | ||
| args = append(f.implied, args...) | ||
|
|
||
| return msg, args | ||
| } | ||
|
|
||
| func (f *hclogFaker) Trace(msg string, args ...interface{}) { | ||
| msg, args = f.buildLog(msg, args...) | ||
| f.logger.Trace(msg, args...) | ||
| } | ||
|
|
||
| func (f *hclogFaker) Debug(msg string, args ...interface{}) { | ||
| msg, args = f.buildLog(msg, args...) | ||
| f.logger.Debug(msg, args...) | ||
| } | ||
|
|
||
| func (f *hclogFaker) Info(msg string, args ...interface{}) { | ||
| msg, args = f.buildLog(msg, args...) | ||
| f.logger.Info(msg, args...) | ||
| } | ||
|
|
||
| func (f *hclogFaker) Warn(msg string, args ...interface{}) { | ||
| msg, args = f.buildLog(msg, args...) | ||
| f.logger.Warn(msg, args...) | ||
| } | ||
|
|
||
| func (f *hclogFaker) Error(msg string, args ...interface{}) { | ||
| msg, args = f.buildLog(msg, args...) | ||
| f.logger.Error(msg, args...) | ||
| } | ||
|
|
||
| func (f *hclogFaker) IsTrace() bool { | ||
| return f.logger.IsTrace() | ||
| } | ||
|
|
||
| func (f *hclogFaker) IsDebug() bool { | ||
| return f.logger.IsDebug() | ||
| } | ||
|
|
||
| func (f *hclogFaker) IsInfo() bool { | ||
| return f.logger.IsInfo() | ||
| } | ||
|
|
||
| func (f *hclogFaker) IsWarn() bool { | ||
| return f.logger.IsWarn() | ||
| } | ||
|
|
||
| func (f *hclogFaker) IsError() bool { | ||
| return !f.logger.IsTrace() && !f.logger.IsDebug() && !f.logger.IsInfo() && !f.IsWarn() | ||
| } | ||
|
|
||
| func (f *hclogFaker) With(args ...interface{}) hclog.Logger { | ||
| var nf = *f | ||
| nf.implied = append(nf.implied, args...) | ||
| return f | ||
| } | ||
|
|
||
| func (f *hclogFaker) Named(name string) hclog.Logger { | ||
| var nf = *f | ||
| if nf.name != "" { | ||
| nf.name = nf.name + "." + name | ||
| } | ||
| return &nf | ||
| } | ||
|
|
||
| func (f *hclogFaker) ResetNamed(name string) hclog.Logger { | ||
| var nf = *f | ||
| nf.name = name | ||
| return &nf | ||
| } | ||
|
|
||
| func (f *hclogFaker) StandardLogger(opts *hclog.StandardLoggerOptions) *stdlog.Logger { | ||
| if opts == nil { | ||
| opts = &hclog.StandardLoggerOptions{} | ||
| } | ||
|
|
||
| return stdlog.New(&stdlogAdapter{f, opts.InferLevels}, "", 0) | ||
| } | ||
|
|
||
| // Provides a io.Writer to shim the data out of *log.Logger | ||
| // and back into our Logger. This is basically the only way to | ||
| // build upon *log.Logger. | ||
| type stdlogAdapter struct { | ||
| hl hclog.Logger | ||
| inferLevels bool | ||
| } | ||
|
|
||
| // Take the data, infer the levels if configured, and send it through | ||
| // a regular Logger | ||
| func (s *stdlogAdapter) Write(data []byte) (int, error) { | ||
| str := string(bytes.TrimRight(data, " \t\n")) | ||
|
|
||
| if s.inferLevels { | ||
| level, str := s.pickLevel(str) | ||
| switch level { | ||
| case hclog.Trace: | ||
| s.hl.Trace(str) | ||
| case hclog.Debug: | ||
| s.hl.Debug(str) | ||
| case hclog.Info: | ||
| s.hl.Info(str) | ||
| case hclog.Warn: | ||
| s.hl.Warn(str) | ||
| case hclog.Error: | ||
| s.hl.Error(str) | ||
| default: | ||
| s.hl.Info(str) | ||
| } | ||
| } else { | ||
| s.hl.Info(str) | ||
| } | ||
|
|
||
| return len(data), nil | ||
| } | ||
|
|
||
| // Detect, based on conventions, what log level this is | ||
| func (s *stdlogAdapter) pickLevel(str string) (hclog.Level, string) { | ||
| switch { | ||
| case strings.HasPrefix(str, "[DEBUG]"): | ||
| return hclog.Debug, strings.TrimSpace(str[7:]) | ||
| case strings.HasPrefix(str, "[TRACE]"): | ||
| return hclog.Trace, strings.TrimSpace(str[7:]) | ||
| case strings.HasPrefix(str, "[INFO]"): | ||
| return hclog.Info, strings.TrimSpace(str[6:]) | ||
| case strings.HasPrefix(str, "[WARN]"): | ||
| return hclog.Warn, strings.TrimSpace(str[7:]) | ||
| case strings.HasPrefix(str, "[ERROR]"): | ||
| return hclog.Error, strings.TrimSpace(str[7:]) | ||
| case strings.HasPrefix(str, "[ERR]"): | ||
| return hclog.Error, strings.TrimSpace(str[5:]) | ||
| default: | ||
| return hclog.Info, str | ||
| } | ||
| } | ||
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was this actually necessary? The pointer access should be transparent I thought.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I went with this since hclog was doing the same, unless it applies differently in that case: https://github.com/hashicorp/go-hclog/blob/master/int.go#L346
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pretty sure it's unnecessary there too. But it doesn't matter either way, really.