Skip to content
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: logr pkg too many params #67

Merged
merged 1 commit into from
Apr 25, 2024
Merged

Conversation

jdpleiness
Copy link
Contributor

@jdpleiness jdpleiness commented Apr 25, 2024

Fix issue in logr pkg where log.Scoped had too many argument calls.

Also fix corresponding tests as well as some slight cleaning for import sorting and spelling 🧹

@jdpleiness jdpleiness marked this pull request as ready for review April 25, 2024 14:37
@@ -12,7 +12,7 @@ import (
func GetLogger(l logr.Logger) (log.Logger, bool) {
sink, ok := l.GetSink().(*LogSink)
if !ok {
return log.Scoped("logr", "new log.Logger created from logr.Logger"), false
return log.Scoped("logr"), false
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actual fix here

Copy link
Member

@bobheadxi bobheadxi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Surprised this didnt get caught given the replace github.com/sourcegraph/log => ../ we have 😬

@jdpleiness jdpleiness merged commit 431bcb6 into main Apr 25, 2024
3 checks passed
@jdpleiness jdpleiness deleted the 04-25-fix_logr_pkg_too_many_params branch April 25, 2024 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants