Skip to content

use bklog instead of logrus#4198

Merged
tonistiigi merged 2 commits intomoby:masterfrom
crazy-max:fix-logrus
Sep 6, 2023
Merged

use bklog instead of logrus#4198
tonistiigi merged 2 commits intomoby:masterfrom
crazy-max:fix-logrus

Conversation

@crazy-max
Copy link
Copy Markdown
Member

follow-up #3705

Looks to be an oversight from #3860.

crazy-max and others added 2 commits September 5, 2023 12:01
Co-authored-by: Justin Chadwell <me@jedevc.com>
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
The regexp should only match *symbols*, so we need to remove the opening
bracket of the function call. Additionally, we need to use anchors to
match the whole string, so as to not break on logrus.TraceLevel and
similar.

Finally, the error message is reworded to also mention bklog.L.

Signed-off-by: Justin Chadwell <me@jedevc.com>
@jedevc
Copy link
Copy Markdown
Member

jedevc commented Sep 5, 2023

@crazy-max I just pushed a couple of updates - looks like we also missed some uses in cmd/buildkitd. Also, the linter should have caught this, but the rule wasn't quite correct, I've updated that (see the commit message) 🎉

@tonistiigi tonistiigi merged commit e743530 into moby:master Sep 6, 2023
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.

3 participants