-
Notifications
You must be signed in to change notification settings - Fork 2.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
fix: logger initialization before flags parsing #7372
Merged
knqyf263
merged 8 commits into
aquasecurity:main
from
DmitriyLewen:fix/log-messages-for-app-and-flag-pkgs
Sep 2, 2024
Merged
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
f719e96
fix: init logger before parse flags
DmitriyLewen 6ad1098
feat: add deferredLogger
DmitriyLewen b53e921
Merge branch 'main' of github.com:DmitriyLewen/trivy into fix/log-mes…
DmitriyLewen b4f276c
refactor: use `DeferredLogger` for `RegisterRegoRules` func
DmitriyLewen c89c05f
revert
knqyf263 b731f78
refactor: add DeferredHandler
knqyf263 da1419d
Merge branch 'main' into fix/log-messages-for-app-and-flag-pkgs
knqyf263 c1fb344
revert
knqyf263 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
package log | ||
|
||
// DeferredLogger are needed to save logs and print them after calling `PrintLogs()` command. | ||
// for example, this may be necessary when the logger is not yet initialized, but messages need to be transmitted | ||
// in this case, the messages are saved and printed after the logger is initialized | ||
var DeferredLogger deferredLogger | ||
|
||
type deferredLogger struct { | ||
deferredLogs []deferredLog | ||
} | ||
|
||
type deferredLog struct { | ||
logFunc func(format string, args ...any) | ||
message string | ||
args []any | ||
} | ||
|
||
func (d *deferredLogger) Debug(message string, args ...any) { | ||
d.deferredLogs = append(d.deferredLogs, deferredLog{ | ||
logFunc: Debug, | ||
message: message, | ||
args: args, | ||
}) | ||
} | ||
|
||
func (d *deferredLogger) Info(message string, args ...any) { | ||
d.deferredLogs = append(d.deferredLogs, deferredLog{ | ||
logFunc: Info, | ||
message: message, | ||
args: args, | ||
}) | ||
} | ||
|
||
func (d *deferredLogger) Warn(message string, args ...any) { | ||
d.deferredLogs = append(d.deferredLogs, deferredLog{ | ||
logFunc: Warn, | ||
message: message, | ||
args: args, | ||
}) | ||
} | ||
|
||
func (d *deferredLogger) Error(message string, args ...any) { | ||
d.deferredLogs = append(d.deferredLogs, deferredLog{ | ||
logFunc: Error, | ||
message: message, | ||
args: args, | ||
}) | ||
} | ||
|
||
func (d *deferredLogger) PrintLogs() { | ||
for _, l := range d.deferredLogs { | ||
l.logFunc(l.message, l.args...) | ||
} | ||
// Clear deferredLogs | ||
d.deferredLogs = nil | ||
} |
Oops, something went wrong.
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.
We can add this into:
trivy/pkg/log/logger.go
Lines 38 to 42 in 6ad1098
But perhaps it won't be entirely obvious